diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-06-07 13:13:37 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-06-07 13:13:37 -0700 |
| commit | bed622b80935baac76775bbd4206d1adc84b2295 (patch) | |
| tree | 7c83003832f769c65fd470de52bb9be9b9d35afc | |
| parent | 2a70296f1a215f02c8213f468a68dd6664947390 (diff) | |
| parent | 55a175279cd8f12c75ba38382938d6562ea3990c (diff) | |
Merge "msm: mdss: Avoid NULL mixer during partial update ROI setup"
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp.h b/drivers/video/fbdev/msm/mdss_mdp.h index cd403f19c088..5a15b557e5c7 100644 --- a/drivers/video/fbdev/msm/mdss_mdp.h +++ b/drivers/video/fbdev/msm/mdss_mdp.h @@ -1107,9 +1107,9 @@ static inline enum mdss_mdp_pu_type mdss_mdp_get_pu_type( if (!is_split_lm(mctl->mfd) || mdss_mdp_is_both_lm_valid(mctl)) pu_type = MDSS_MDP_DEFAULT_UPDATE; - else if (mctl->mixer_left->valid_roi) + else if (mctl->mixer_left && mctl->mixer_left->valid_roi) pu_type = MDSS_MDP_LEFT_ONLY_UPDATE; - else if (mctl->mixer_right->valid_roi) + else if (mctl->mixer_right && mctl->mixer_right->valid_roi) pu_type = MDSS_MDP_RIGHT_ONLY_UPDATE; else pr_err("%s: invalid pu_type\n", __func__); |