From 6c1ecba8d84841277d68140ef485335d5be28485 Mon Sep 17 00:00:00 2001 From: Lothar Waßmann Date: Thu, 22 Nov 2012 13:49:14 +0100 Subject: video: mxsfb: fix crash when unblanking the display The VDCTRL4 register does not provide the MXS SET/CLR/TOGGLE feature. The write in mxsfb_disable_controller() sets the data_cnt for the LCD DMA to 0 which obviously means the max. count for the LCD DMA and leads to overwriting arbitrary memory when the display is unblanked. Signed-off-by: Lothar Waßmann Acked-by: Juergen Beisert Tested-by: Lauri Hintsala Cc: Signed-off-by: Shawn Guo --- drivers/video/mxsfb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'drivers/video/mxsfb.c') diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c index 49619b441500..f2a49ef772f3 100644 --- a/drivers/video/mxsfb.c +++ b/drivers/video/mxsfb.c @@ -369,7 +369,8 @@ static void mxsfb_disable_controller(struct fb_info *fb_info) loop--; } - writel(VDCTRL4_SYNC_SIGNALS_ON, host->base + LCDC_VDCTRL4 + REG_CLR); + reg = readl(host->base + LCDC_VDCTRL4); + writel(reg & ~VDCTRL4_SYNC_SIGNALS_ON, host->base + LCDC_VDCTRL4); clk_disable_unprepare(host->clk); -- cgit v1.2.3-55-g7522