From fd20c447bc00e997944aadcffdc6f5dc2d49854b Mon Sep 17 00:00:00 2001 From: Jingoo Han Date: Tue, 24 May 2011 08:55:31 +0000 Subject: [PATCH] --- yaml --- r: 251114 b: refs/heads/master c: 6aa9681100303bd467cbd0262eb00da8d492fc7f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/s3c-fb.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 89f1ed1bebe0..fd59afefd33e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8f25c01dec43ccfb0ec7d6216c1494772917a429 +refs/heads/master: 6aa9681100303bd467cbd0262eb00da8d492fc7f diff --git a/trunk/drivers/video/s3c-fb.c b/trunk/drivers/video/s3c-fb.c index 6b7c5a8aea8a..2bd86a9fa3a0 100644 --- a/trunk/drivers/video/s3c-fb.c +++ b/trunk/drivers/video/s3c-fb.c @@ -1526,7 +1526,8 @@ static int s3c_fb_resume(struct device *dev) clk_enable(sfb->bus_clk); - /* setup registers */ + /* setup gpio and output polarity controls */ + pd->setup_gpio(); writel(pd->vidcon1, sfb->regs + VIDCON1); /* zero all windows before we do anything */ @@ -1584,7 +1585,8 @@ static int s3c_fb_runtime_resume(struct device *dev) clk_enable(sfb->bus_clk); - /* setup registers */ + /* setup gpio and output polarity controls */ + pd->setup_gpio(); writel(pd->vidcon1, sfb->regs + VIDCON1); /* zero all windows before we do anything */