diff options
| author | Carl Vanderlip <carlv@codeaurora.org> | 2013-12-17 15:53:34 -0800 |
|---|---|---|
| committer | Ping Li <quicpingli@codeaurora.org> | 2014-01-23 19:08:11 -0800 |
| commit | 60bacc2a142e8f5ad05cf55dbb51fb13f80a3d02 (patch) | |
| tree | edee9df2e84d58f2e144eeb1761573b75a1706c0 | |
| parent | f75c756ec478db2d8854f262e67a180d768dc627 (diff) | |
msm: mdss: Fix assertive display HW range checks
Fix off by one error leading to log spam. 'nad_cfgs' is the upper bound of
the zero-indexed mixer/AD/dspp pipe enumeration.
Change-Id: I963d175aad23a8eb621772d6c9bd06676fa2e27e
Signed-off-by: Carl Vanderlip <carlv@codeaurora.org>
Signed-off-by: Ping Li <quicpingli@codeaurora.org>
| -rw-r--r-- | drivers/video/msm/mdss/mdss_mdp_pp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/msm/mdss/mdss_mdp_pp.c b/drivers/video/msm/mdss/mdss_mdp_pp.c index 2710c9fe4af..d6ac4b69681 100644 --- a/drivers/video/msm/mdss/mdss_mdp_pp.c +++ b/drivers/video/msm/mdss/mdss_mdp_pp.c @@ -1688,7 +1688,7 @@ int mdss_mdp_pp_setup_locked(struct mdss_mdp_ctl *ctl) if (mdata->nad_cfgs == 0) valid_mixers = false; for (i = 0; i < mixer_cnt && valid_mixers; i++) { - if (mixer_id[i] > mdata->nad_cfgs) + if (mixer_id[i] >= mdata->nad_cfgs) valid_mixers = false; } if (valid_mixers && (mixer_cnt <= mdata->nmax_concurrent_ad_hw)) { @@ -4544,7 +4544,7 @@ static void pp_ad_calc_worker(struct work_struct *work) ctl = mfd_to_ctl(ad->mfd); mdata = mfd_to_mdata(ad->mfd); - if (!mdata || ad->calc_hw_num > mdata->nad_cfgs) { + if (!mdata || ad->calc_hw_num >= mdata->nad_cfgs) { mutex_unlock(&ad->lock); return; } |