Merge branch 'fixes-gpio-to-irq' into fixes

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / video / pxafb.c

diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 1d1e4f1..3f90255 100644 (file)
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -54,6 +54,7 @@
 #include <linux/mutex.h>
 #include <linux/kthread.h>
 #include <linux/freezer.h>
+#include <linux/console.h>
 
 #include <mach/hardware.h>
 #include <asm/io.h>
@@ -730,9 +731,12 @@ static int overlayfb_open(struct fb_info *info, int user)
        if (user == 0)
                return -ENODEV;
 
-       if (ofb->usage++ == 0)
+       if (ofb->usage++ == 0) {
                /* unblank the base framebuffer */
+               console_lock();
                fb_blank(&ofb->fbi->fb, FB_BLANK_UNBLANK);
+               console_unlock();
+       }
 
        return 0;
 }
@@ -1431,7 +1435,7 @@ static void pxafb_enable_controller(struct pxafb_info *fbi)
        pr_debug("reg_lccr3 0x%08x\n", (unsigned int) fbi->reg_lccr3);
 
        /* enable LCD controller clock */
-       clk_enable(fbi->clk);
+       clk_prepare_enable(fbi->clk);
 
        if (fbi->lccr0 & LCCR0_LCDT)
                return;
@@ -1471,7 +1475,7 @@ static void pxafb_disable_controller(struct pxafb_info *fbi)
        wait_for_completion_timeout(&fbi->disable_done, 200 * HZ / 1000);
 
        /* disable LCD controller clock */
-       clk_disable(fbi->clk);
+       clk_disable_unprepare(fbi->clk);
 }
 
 /*