diff options
Diffstat (limited to 'drivers/video/atafb.c')
-rw-r--r-- | drivers/video/atafb.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c index 477ce55bbae9..8058572a7428 100644 --- a/drivers/video/atafb.c +++ b/drivers/video/atafb.c | |||
@@ -3075,8 +3075,7 @@ int __init atafb_setup(char *options) | |||
3075 | 3075 | ||
3076 | int __init atafb_init(void) | 3076 | int __init atafb_init(void) |
3077 | { | 3077 | { |
3078 | int pad; | 3078 | int pad, detected_mode, error; |
3079 | int detected_mode; | ||
3080 | unsigned int defmode = 0; | 3079 | unsigned int defmode = 0; |
3081 | unsigned long mem_req; | 3080 | unsigned long mem_req; |
3082 | 3081 | ||
@@ -3116,8 +3115,12 @@ int __init atafb_init(void) | |||
3116 | printk("atafb_init: initializing Falcon hw\n"); | 3115 | printk("atafb_init: initializing Falcon hw\n"); |
3117 | fbhw = &falcon_switch; | 3116 | fbhw = &falcon_switch; |
3118 | atafb_ops.fb_setcolreg = &falcon_setcolreg; | 3117 | atafb_ops.fb_setcolreg = &falcon_setcolreg; |
3119 | request_irq(IRQ_AUTO_4, falcon_vbl_switcher, IRQ_TYPE_PRIO, | 3118 | error = request_irq(IRQ_AUTO_4, falcon_vbl_switcher, |
3120 | "framebuffer/modeswitch", falcon_vbl_switcher); | 3119 | IRQ_TYPE_PRIO, |
3120 | "framebuffer/modeswitch", | ||
3121 | falcon_vbl_switcher); | ||
3122 | if (error) | ||
3123 | return error; | ||
3121 | defmode = DEFMODE_F30; | 3124 | defmode = DEFMODE_F30; |
3122 | break; | 3125 | break; |
3123 | } | 3126 | } |