summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorVasily Khoruzhick <anarsoul@gmail.com>2012-02-26 16:52:02 +0300
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2012-03-06 11:56:48 +0000
commit23f1365677a84f775d374a1d8ca0360257685894 (patch)
treefa905781624cb9e3ce70e0082092ef2527149834 /drivers/video
parentd282e4d9353b9e7971713aa9e78da716e4a1262d (diff)
pxafb: do console locking before calling fb_blank()
Otherwise we hit WARN_CONSOLE_UNLOCKED in do_unblank_screen Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/pxafb.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 1d1e4f175e7..c176561a222 100644
--- 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;
}