On 02/26/2012 01:52 PM, Vasily Khoruzhick wrote: > Otherwise we hit WARN_CONSOLE_UNLOCKED in do_unblank_screen > > Signed-off-by: Vasily Khoruzhick <anarsoul@xxxxxxxxx> Applied. Thanks, Florian Tobias Schandinat > --- > drivers/video/pxafb.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c > index 1d1e4f1..c176561 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; > } -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html