From 384ea30998143d6056ee123933f4daa32285632f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lothar=20Wa=C3=9Fmann?= Date: Thu, 22 Nov 2012 13:49:14 +0100 Subject: [PATCH] --- yaml --- r: 348479 b: refs/heads/master c: 6c1ecba8d84841277d68140ef485335d5be28485 h: refs/heads/master i: 348477: f24d7c8fb1e780018c32bb69fdc37469552d9a24 348475: 090ecb78d20e8d518d913b9d4c71c403183cd91a 348471: b4538c3d78d4658867137a6024fa231f45dff7fd 348463: 13202cd69723de2be469aa6aa8cc8c284cbb5a39 348447: 987fdb4ce01fba10c69a1bdb5d5260ee9080c675 348415: 2ea98c04aa9cacddb3f0d3f3feda9ae6df47e480 v: v3 --- [refs] | 2 +- trunk/drivers/video/mxsfb.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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);