diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-07-30 18:14:15 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-30 18:14:15 -0400 |
| commit | a670fcb43f01a67ef56176afc76e5d43d128b25c (patch) | |
| tree | 09c9411c78a33ff980e9ea871bc7686e7589abbf /drivers/video/console/fbcon.c | |
| parent | 327309e899662b482c58cf25f574513d38b5788c (diff) | |
| parent | b0825488a642cadcf39709961dde61440cb0731c (diff) | |
/spare/repo/netdev-2.6 branch 'master'
Diffstat (limited to 'drivers/video/console/fbcon.c')
| -rw-r--r-- | drivers/video/console/fbcon.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index 9dd0fbccf994..35c88bd7ba5e 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c | |||
| @@ -275,7 +275,8 @@ static void fb_flashcursor(void *private) | |||
| 275 | 275 | ||
| 276 | if (!vc || !CON_IS_VISIBLE(vc) || | 276 | if (!vc || !CON_IS_VISIBLE(vc) || |
| 277 | fbcon_is_inactive(vc, info) || | 277 | fbcon_is_inactive(vc, info) || |
| 278 | registered_fb[con2fb_map[vc->vc_num]] != info) | 278 | registered_fb[con2fb_map[vc->vc_num]] != info || |
| 279 | vc_cons[ops->currcon].d->vc_deccm != 1) | ||
| 279 | return; | 280 | return; |
| 280 | acquire_console_sem(); | 281 | acquire_console_sem(); |
| 281 | p = &fb_display[vc->vc_num]; | 282 | p = &fb_display[vc->vc_num]; |