diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-10-05 01:30:08 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-10-05 01:30:08 -0700 |
| commit | e772a5206ca5db530d247bdf2feee6ee32a869f1 (patch) | |
| tree | 18c79d7f4f2f36d6196caee854101645289df37a /drivers/video | |
| parent | 8ce3cab712ce1c94b4bce853213826ff2afa8a80 (diff) | |
| parent | 799761a1052ad82f904660c29013783e8a2e2d22 (diff) | |
Merge "mdss: mdp: Fix access after null check"
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_ctl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_ctl.c b/drivers/video/fbdev/msm/mdss_mdp_ctl.c index 8cbe32940887..710aebbd9c59 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_ctl.c +++ b/drivers/video/fbdev/msm/mdss_mdp_ctl.c @@ -4894,7 +4894,8 @@ static inline void __mdss_mdp_mixer_write_layer(struct mdss_mdp_ctl *ctl, u32 off[NUM_MIXERCFG_REGS]; int i; - BUG_ON(!values || count < NUM_MIXERCFG_REGS); + if (WARN_ON(!values || count < NUM_MIXERCFG_REGS)) + return; __mdss_mdp_mixer_get_offsets(mixer_num, off, ARRAY_SIZE(off)); |