diff options
| author | Paul Mackerras | 2008-12-16 04:38:58 +0100 |
|---|---|---|
| committer | Paul Mackerras | 2008-12-16 04:38:58 +0100 |
| commit | 1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a (patch) | |
| tree | 0cf88547108a750d6eb910564ef5bf0ffb5ceef3 /drivers/video/console/fbcon.c | |
| parent | powerpc/85xx: Fix compile issues with mpc8572ds.dts (diff) | |
| parent | powerpc/cell/axon-msi: Fix MSI after kexec (diff) | |
| download | kernel-qcow2-linux-1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a.tar.gz kernel-qcow2-linux-1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a.tar.xz kernel-qcow2-linux-1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a.zip | |
Merge branch 'merge' into next
Diffstat (limited to 'drivers/video/console/fbcon.c')
| -rw-r--r-- | drivers/video/console/fbcon.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index 67ff370d80af..0b2adefe9e3d 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c @@ -3531,12 +3531,18 @@ static void fbcon_exit(void) softback_buf = 0UL; for (i = 0; i < FB_MAX; i++) { + int pending; + mapped = 0; info = registered_fb[i]; if (info == NULL) continue; + pending = cancel_work_sync(&info->queue); + DPRINTK("fbcon: %s pending work\n", (pending ? "canceled" : + "no")); + for (j = first_fb_vc; j <= last_fb_vc; j++) { if (con2fb_map[j] == i) mapped = 1; |