summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiu Ying <Ying.Liu@freescale.com>2015-04-30 13:41:43 +0800
committerJason Liu <r64343@freescale.com>2015-05-08 17:25:18 +0800
commit8d1d1b099d1ace46d2e623d1f296f4f7cfb253d1 (patch)
tree6b1186bc7ee1552ccbb9e17ac59430f9b6e41d52
parent408dc3ba606c8cc5657eef630af250525747543f (diff)
MLK-10785 mxc ipuv3 fb: Correct ->resolve in bailout of ->set_par due to no PRE
We should set mxcfbi->resolve to be false in the bailout path of ops->set_par due to no PRE is available. Otherwise, the users may call the PAN_DISPLAY ioctrl to switch buffer right after the bailout path and accidently runs the resolving logic for switching buffer. Signed-off-by: Liu Ying <Ying.Liu@freescale.com> (cherry picked from commit 26e5c1d73e3bd17384130647bc55757ff10cb3a5)
-rw-r--r--drivers/video/mxc/mxc_ipuv3_fb.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/mxc/mxc_ipuv3_fb.c b/drivers/video/mxc/mxc_ipuv3_fb.c
index aa13b0266f06..c303404b6bca 100644
--- a/drivers/video/mxc/mxc_ipuv3_fb.c
+++ b/drivers/video/mxc/mxc_ipuv3_fb.c
@@ -567,6 +567,7 @@ static int _setup_disp_channel2(struct fb_info *fbi)
dev_err(fbi->device,
"failed to alloc PRE\n");
mxc_fbi->prefetch = mxc_fbi->cur_prefetch;
+ mxc_fbi->resolve = false;
return mxc_fbi->pre_num;
}
}