Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 276ddca7 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "fbdev: msm: fix ret value while translating to mdp format"

parents 14d3e63f 2cf04dbf

drivers/video/fbdev/msm/mdss_fb.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

	}