diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2008-11-18 14:45:23 -0500 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2008-12-28 14:00:06 -0500 |
commit | 7f877ebb32ac9a4b0783e825cef84c6ace87fe90 (patch) | |
tree | aa9007fea1a65ce8b483ae1dc38b4cc1e1cd30cd /drivers/video/console | |
parent | 79f0c9a0479060e3a8607d93bc8d81ff962acc87 (diff) |
fbcon: Protect free_irq() by MACH_IS_ATARI check
Add missing check for Atari in free_irq() call, which could cause problems on
multi-platform m68k kernels.
Reported-by: Brad Boyer <flar@allandria.com>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'drivers/video/console')
-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 e99bb7c51798..4bcff81b50e0 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c | |||
@@ -3455,7 +3455,8 @@ static void fbcon_exit(void) | |||
3455 | return; | 3455 | return; |
3456 | 3456 | ||
3457 | #ifdef CONFIG_ATARI | 3457 | #ifdef CONFIG_ATARI |
3458 | free_irq(IRQ_AUTO_4, fb_vbl_handler); | 3458 | if (MACH_IS_ATARI) |
3459 | free_irq(IRQ_AUTO_4, fb_vbl_handler); | ||
3459 | #endif | 3460 | #endif |
3460 | 3461 | ||
3461 | kfree((void *)softback_buf); | 3462 | kfree((void *)softback_buf); |