diff options
author | Vasily Khoruzhick <anarsoul@gmail.com> | 2012-02-26 08:52:02 -0500 |
---|---|---|
committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-03-06 06:56:48 -0500 |
commit | 23f1365677a84f775d374a1d8ca0360257685894 (patch) | |
tree | fa905781624cb9e3ce70e0082092ef2527149834 /drivers/video/pxafb.c | |
parent | d282e4d9353b9e7971713aa9e78da716e4a1262d (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/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 @@ | |||
54 | #include <linux/mutex.h> | 54 | #include <linux/mutex.h> |
55 | #include <linux/kthread.h> | 55 | #include <linux/kthread.h> |
56 | #include <linux/freezer.h> | 56 | #include <linux/freezer.h> |
57 | #include <linux/console.h> | ||
57 | 58 | ||
58 | #include <mach/hardware.h> | 59 | #include <mach/hardware.h> |
59 | #include <asm/io.h> | 60 | #include <asm/io.h> |
@@ -730,9 +731,12 @@ static int overlayfb_open(struct fb_info *info, int user) | |||
730 | if (user == 0) | 731 | if (user == 0) |
731 | return -ENODEV; | 732 | return -ENODEV; |
732 | 733 | ||
733 | if (ofb->usage++ == 0) | 734 | if (ofb->usage++ == 0) { |
734 | /* unblank the base framebuffer */ | 735 | /* unblank the base framebuffer */ |
736 | console_lock(); | ||
735 | fb_blank(&ofb->fbi->fb, FB_BLANK_UNBLANK); | 737 | fb_blank(&ofb->fbi->fb, FB_BLANK_UNBLANK); |
738 | console_unlock(); | ||
739 | } | ||
736 | 740 | ||
737 | return 0; | 741 | return 0; |
738 | } | 742 | } |