diff options
| author | Vasily Khoruzhick <anarsoul@gmail.com> | 2012-02-26 14:52:02 +0100 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-03-06 12:56:48 +0100 |
| commit | 23f1365677a84f775d374a1d8ca0360257685894 (patch) | |
| tree | fa905781624cb9e3ce70e0082092ef2527149834 /drivers/video/pxafb.c | |
| parent | Merge commit 'v3.3-rc6' into fbdev-next (diff) | |
| download | linux-23f1365677a84f775d374a1d8ca0360257685894.tar.xz linux-23f1365677a84f775d374a1d8ca0360257685894.zip | |
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/pxafb.c')
| -rw-r--r-- | drivers/video/pxafb.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index 1d1e4f175e78..c176561a2222 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; } |