diff options
Diffstat (limited to 'arch/m68k/atari/atakeyb.c')
-rw-r--r-- | arch/m68k/atari/atakeyb.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/m68k/atari/atakeyb.c b/arch/m68k/atari/atakeyb.c index c038b7c7eff0..a5f33c059979 100644 --- a/arch/m68k/atari/atakeyb.c +++ b/arch/m68k/atari/atakeyb.c | |||
@@ -33,7 +33,6 @@ | |||
33 | #include <asm/atari_joystick.h> | 33 | #include <asm/atari_joystick.h> |
34 | #include <asm/irq.h> | 34 | #include <asm/irq.h> |
35 | 35 | ||
36 | extern unsigned int keymap_count; | ||
37 | 36 | ||
38 | /* Hook for MIDI serial driver */ | 37 | /* Hook for MIDI serial driver */ |
39 | void (*atari_MIDI_interrupt_hook) (void); | 38 | void (*atari_MIDI_interrupt_hook) (void); |
@@ -567,14 +566,19 @@ static int atari_keyb_done = 0; | |||
567 | 566 | ||
568 | int atari_keyb_init(void) | 567 | int atari_keyb_init(void) |
569 | { | 568 | { |
569 | int error; | ||
570 | |||
570 | if (atari_keyb_done) | 571 | if (atari_keyb_done) |
571 | return 0; | 572 | return 0; |
572 | 573 | ||
573 | kb_state.state = KEYBOARD; | 574 | kb_state.state = KEYBOARD; |
574 | kb_state.len = 0; | 575 | kb_state.len = 0; |
575 | 576 | ||
576 | request_irq(IRQ_MFP_ACIA, atari_keyboard_interrupt, IRQ_TYPE_SLOW, | 577 | error = request_irq(IRQ_MFP_ACIA, atari_keyboard_interrupt, |
577 | "keyboard/mouse/MIDI", atari_keyboard_interrupt); | 578 | IRQ_TYPE_SLOW, "keyboard/mouse/MIDI", |
579 | atari_keyboard_interrupt); | ||
580 | if (error) | ||
581 | return error; | ||
578 | 582 | ||
579 | atari_turnoff_irq(IRQ_MFP_ACIA); | 583 | atari_turnoff_irq(IRQ_MFP_ACIA); |
580 | do { | 584 | do { |