diff options
| author | Liu Ying <Ying.Liu@freescale.com> | 2015-04-09 12:43:36 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2015-05-08 17:24:58 +0800 |
| commit | d941516283e58f15efab98e8688a4c2e4d424302 (patch) | |
| tree | 47c9b382617a472dec44533e4ebe56077a0a10c2 | |
| parent | e8a10662cd1e32f0eb6746534a41dd855b050fe3 (diff) | |
MLK-10660-1 video: mxc ipuv3 fb: Fix _setup_disp_channel2 bailout in ->set_par
We should uninitialize ipu channel only for !on_the_fly cases in the bail-out
path of _setup_disp_channel2() in ->fb_set_par(), because we should be able to
keep the display path un-touched or un-impacted in the on_the_fly cases even if
we return failure from _setup_display_channel2().
Signed-off-by: Liu Ying <Ying.Liu@freescale.com>
| -rw-r--r-- | drivers/video/mxc/mxc_ipuv3_fb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/mxc/mxc_ipuv3_fb.c b/drivers/video/mxc/mxc_ipuv3_fb.c index 228338273e2d..23b04e6fbd61 100644 --- a/drivers/video/mxc/mxc_ipuv3_fb.c +++ b/drivers/video/mxc/mxc_ipuv3_fb.c @@ -1315,7 +1315,8 @@ static int mxcfb_set_par(struct fb_info *fbi) retval = _setup_disp_channel2(fbi); if (retval) { - ipu_uninit_channel(mxc_fbi->ipu, mxc_fbi->ipu_ch); + if (!on_the_fly) + ipu_uninit_channel(mxc_fbi->ipu, mxc_fbi->ipu_ch); return retval; } |