diff options
| author | Pawan Kumar <pavaku@codeaurora.org> | 2013-11-05 10:52:20 +0530 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 20:23:02 -0700 |
| commit | 2f64e3f96c311e179a1da50c1e21d2e256a0b1c8 (patch) | |
| tree | 8e12abb40e482c831d8880e0fa61d9711ea14e7c | |
| parent | 561365346ee80142577b5cc1eb0dd2851c0ddd79 (diff) | |
msm: mdss: Check ctl in mdss_mdp_mixer_get before using
Put NULL check for ctl before using in mdss_mdp_mixer_get.
Change-Id: Ia1bc035df46c9e237c244623e61a6802cf0d9110
Signed-off-by: Pawan Kumar <pavaku@codeaurora.org>
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_ctl.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_ctl.c b/drivers/video/fbdev/msm/mdss_mdp_ctl.c index 57c49930ec77..060d6419924f 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_ctl.c +++ b/drivers/video/fbdev/msm/mdss_mdp_ctl.c @@ -1577,9 +1577,17 @@ int mdss_mdp_ctl_addr_setup(struct mdss_data_type *mdata, struct mdss_mdp_mixer *mdss_mdp_mixer_get(struct mdss_mdp_ctl *ctl, int mux) { struct mdss_mdp_mixer *mixer = NULL; - struct mdss_overlay_private *mdp5_data = mfd_to_mdp5_data(ctl->mfd); - if (!ctl) + struct mdss_overlay_private *mdp5_data = NULL; + if (!ctl || !ctl->mfd) { + pr_err("ctl not initialized\n"); return NULL; + } + + mdp5_data = mfd_to_mdp5_data(ctl->mfd); + if (!mdp5_data) { + pr_err("ctl not initialized\n"); + return NULL; + } switch (mux) { case MDSS_MDP_MIXER_MUX_DEFAULT: |