diff --git a/[refs] b/[refs] index ac2331b22f08..ec00ae1e2da2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 664e9e495a3ada96ed2ebab89edb40c4fc132bd7 +refs/heads/master: 6c1ecba8d84841277d68140ef485335d5be28485 diff --git a/trunk/drivers/video/mxsfb.c b/trunk/drivers/video/mxsfb.c index 49619b441500..f2a49ef772f3 100644 --- a/trunk/drivers/video/mxsfb.c +++ b/trunk/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);