summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-09-28 05:48:48 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2018-09-28 05:48:48 -0700
commite3f184e82e277830b0a71169a48c9c022ffdbec7 (patch)
tree1c423406dbd61f14da255076c837518ad91356f9
parent5a2c9e54f4bb3a32f792f9e3bc92b3763bc5999a (diff)
parentd48974bb7aa1368ac972e0cc6c7bb25f129b3e12 (diff)
Merge "mdss: mdp: Add null check for ctl"
-rw-r--r--drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c b/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c
index a259ddda2ce2..478dca59db2b 100644
--- a/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c
+++ b/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c
@@ -738,6 +738,12 @@ int mdss_mdp_resource_control(struct mdss_mdp_ctl *ctl, u32 sw_event)
int rc = 0;
bool schedule_off = false;
+ if (!ctl) {
+ pr_err("%s invalid ctl\n", __func__);
+ rc = -EINVAL;
+ goto exit;
+ }
+
/* Get both controllers in the correct order for dual displays */
mdss_mdp_get_split_display_ctls(&ctl, &sctl);