diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2020-06-11 08:22:10 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2020-06-11 08:22:09 -0700 |
| commit | 276ddca7adc68caa71ebeefce827e4b99deabf99 (patch) | |
| tree | 1f00d20b223741fdcf5a2f8032d32c162b7b87a7 | |
| parent | 14d3e63f901b47deefb34e25caa4eb533e7d9b4d (diff) | |
| parent | 2cf04dbfc0848ec72cb1a956d9ea60803a18c2e3 (diff) | |
Merge "fbdev: msm: fix ret value while translating to mdp format"
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_fb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/fbdev/msm/mdss_fb.c b/drivers/video/fbdev/msm/mdss_fb.c index 31f4ef83b8b3..a7f21c3a4f18 100644 --- a/drivers/video/fbdev/msm/mdss_fb.c +++ b/drivers/video/fbdev/msm/mdss_fb.c @@ -3992,7 +3992,7 @@ static int mdss_fb_set_par(struct fb_info *info) { struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par; struct fb_var_screeninfo *var = &info->var; - int old_imgType, old_format; + int old_imgType, old_format, out_format; int ret = 0; ret = mdss_fb_pan_idle(mfd); @@ -4076,9 +4076,9 @@ static int mdss_fb_set_par(struct fb_info *info) mfd->fbi->var.yres) * mfd->fb_page; old_format = mfd->panel_info->out_format; - mfd->panel_info->out_format = - mdss_grayscale_to_mdp_format(var->grayscale); - if (!IS_ERR_VALUE(mfd->panel_info->out_format)) { + out_format = mdss_grayscale_to_mdp_format(var->grayscale); + if (!IS_ERR_VALUE(out_format)) { + mfd->panel_info->out_format = out_format; if (old_format != mfd->panel_info->out_format) mfd->panel_reconfig = true; } |