summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorCarl Vanderlip <carlv@codeaurora.org>2013-11-20 17:59:05 -0800
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-23 20:23:37 -0700
commitb7a4a49ae3b09be0db92d7444afaabb85f6de743 (patch)
tree39a9ddebea8c52d815c8e0af4ab00c453d55a7c5 /drivers
parent3dadb7f6ad23d1b40cd3d22899a42d546ef5d27e (diff)
msm: mdss: Prevent AD on out of range displays
Prevent array out of bounds error when displays fall out of range for AD support. Change-Id: Iffebee5ed78bf256c8dd7c6f62587ac27cb2241e Signed-off-by: Carl Vanderlip <carlv@codeaurora.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/fbdev/msm/mdss_mdp_pp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_pp.c b/drivers/video/fbdev/msm/mdss_mdp_pp.c
index 8765e744edd2..b35bc692589a 100644
--- a/drivers/video/fbdev/msm/mdss_mdp_pp.c
+++ b/drivers/video/fbdev/msm/mdss_mdp_pp.c
@@ -1436,7 +1436,7 @@ static int pp_dspp_setup(u32 disp_num, struct mdss_mdp_mixer *mixer)
flags = 0;
mixer_cnt = mdss_mdp_get_ctl_mixers(disp_num, mixer_id);
- if (dspp_num < mdata->nad_cfgs &&
+ if (dspp_num < mdata->nad_cfgs && disp_num < mdata->nad_cfgs &&
(mixer_cnt <= mdata->nmax_concurrent_ad_hw)) {
ad = &mdata->ad_cfgs[disp_num];
ad_flags = ad->reg_sts;