diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-28 08:41:38 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-28 08:41:38 -0800 |
| commit | 6bc4fad307f91c0872914fd810cb16fa061a7842 (patch) | |
| tree | c8434e8c1ee7e0edf53e91ced60a515f63bde2c3 /drivers/video/fbdev | |
| parent | 34c0f9a61024a9f6f91730e92fe96ad8221ef551 (diff) | |
| parent | 7cc7987034cece54e33899cee5d7064a77dbefd0 (diff) | |
Merge "msm: mdss: Fix potential null pointer dereference"
Diffstat (limited to 'drivers/video/fbdev')
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_ctl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_ctl.c b/drivers/video/fbdev/msm/mdss_mdp_ctl.c index f397aca8ad3a..f7840ee8245e 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_ctl.c +++ b/drivers/video/fbdev/msm/mdss_mdp_ctl.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -4575,7 +4575,8 @@ int mdss_mdp_ctl_reset(struct mdss_mdp_ctl *ctl, bool is_recovery) if (mixer) { mdss_mdp_pipe_reset(mixer, is_recovery); - if (is_dual_lm_single_display(ctl->mfd)) + if (is_dual_lm_single_display(ctl->mfd) && + ctl->mixer_right) mdss_mdp_pipe_reset(ctl->mixer_right, is_recovery); } |