diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-10-05 01:30:06 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-10-05 01:30:05 -0700 |
| commit | 6ff7453f913b1d780eae57a0d2da4d5b5b8a3985 (patch) | |
| tree | a41bc3db5fe35e0ba1051e33defba04f297f649c /drivers/video/fbdev | |
| parent | d750db225fcac4b7b2928c910fb37b36aa42f6d6 (diff) | |
| parent | b942797ff21a3298d59fdab287c314daf23422e9 (diff) | |
Merge "mdss: mdp: Add error check for split ctl"
Diffstat (limited to 'drivers/video/fbdev')
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c b/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c index 478dca59db2b..83ab9c3973af 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c +++ b/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c @@ -745,7 +745,9 @@ int mdss_mdp_resource_control(struct mdss_mdp_ctl *ctl, u32 sw_event) } /* Get both controllers in the correct order for dual displays */ - mdss_mdp_get_split_display_ctls(&ctl, &sctl); + rc = mdss_mdp_get_split_display_ctls(&ctl, &sctl); + if (rc) + goto exit; ctx = (struct mdss_mdp_cmd_ctx *) ctl->intf_ctx[MASTER_CTX]; if (!ctx) { |