diff options
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/console/fbcon.c | 3 | ||||
| -rw-r--r-- | drivers/video/display/jbt6k74.c | 8 |
2 files changed, 3 insertions, 8 deletions
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index 6b666a50e3a..285acaeafe8 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c @@ -401,6 +401,9 @@ static void fb_flashcursor(struct work_struct *work) int c; int mode; + if (info->state != FBINFO_STATE_RUNNING) + return; + acquire_console_sem(); if (ops && ops->currcon != -1) vc = vc_cons[ops->currcon].d; diff --git a/drivers/video/display/jbt6k74.c b/drivers/video/display/jbt6k74.c index 807d6b538f7..77f9528ff5a 100644 --- a/drivers/video/display/jbt6k74.c +++ b/drivers/video/display/jbt6k74.c @@ -692,14 +692,6 @@ int jbt6k74_resume(struct spi_device *spi) struct jbt_info *jbt = dev_get_drvdata(&spi->dev); struct jbt6k74_platform_data *jbt6k74_pdata = spi->dev.platform_data; - /* we can get called twice with all dependencies resumed if our core - * resume callback is last of all. Protect against doing anything twice - */ - if (jbt->have_resumed) - return 0; - - jbt->have_resumed |= 1; - switch (jbt->last_state) { case JBT_STATE_QVGA_NORMAL: jbt6k74_enter_state(jbt, JBT_STATE_QVGA_NORMAL); |