Commit 23f13656 authored by Vasily Khoruzhick's avatar Vasily Khoruzhick Committed by Florian Tobias Schandinat

pxafb: do console locking before calling fb_blank()

Otherwise we hit WARN_CONSOLE_UNLOCKED in do_unblank_screen
Signed-off-by: default avatarVasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: default avatarFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
parent d282e4d9
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/freezer.h> #include <linux/freezer.h>
#include <linux/console.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/io.h> #include <asm/io.h>
...@@ -730,9 +731,12 @@ static int overlayfb_open(struct fb_info *info, int user) ...@@ -730,9 +731,12 @@ static int overlayfb_open(struct fb_info *info, int user)
if (user == 0) if (user == 0)
return -ENODEV; return -ENODEV;
if (ofb->usage++ == 0) if (ofb->usage++ == 0) {
/* unblank the base framebuffer */ /* unblank the base framebuffer */
console_lock();
fb_blank(&ofb->fbi->fb, FB_BLANK_UNBLANK); fb_blank(&ofb->fbi->fb, FB_BLANK_UNBLANK);
console_unlock();
}
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment