diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-01-30 07:23:58 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-01-30 07:23:56 -0800 |
| commit | e1e13d19d12c97f568d29d7671e73d16ab109ff3 (patch) | |
| tree | 7e4a5c323f9601dd5af7c26ec8950d91e6e819db | |
| parent | 26d8181bc8da0d8b41f6173e23e9cacdf579745e (diff) | |
| parent | 60bacc2a142e8f5ad05cf55dbb51fb13f80a3d02 (diff) | |
Merge "msm: mdss: Fix assertive display HW range checks"
| -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 af437f82c8d..7571d3939de 100644 --- a/drivers/video/msm/mdss/mdss_mdp_pp.c +++ b/drivers/video/msm/mdss/mdss_mdp_pp.c @@ -1725,7 +1725,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)) { @@ -4581,7 +4581,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; } |