Skip to content

Commit

Permalink
input/atari: Use the correct mouse interrupt hook
Browse files Browse the repository at this point in the history
The Atari keyboard driver calls atari_mouse_interrupt_hook if it's set, not
atari_input_mouse_interrupt_hook. Fix below.

[geert] Killed off atari_mouse_interrupt_hook completely, after fixing another
incorrect assignment in atarimouse.c.

Signed-off-by: Michael Schmitz <schmitz@debian.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
  • Loading branch information
Michael Schmitz authored and Geert Uytterhoeven committed May 19, 2011
1 parent 79abeed commit 7786908
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 8 deletions.
7 changes: 2 additions & 5 deletions arch/m68k/atari/atakeyb.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,10 @@

/* Hook for MIDI serial driver */
void (*atari_MIDI_interrupt_hook) (void);
/* Hook for mouse driver */
void (*atari_mouse_interrupt_hook) (char *);
/* Hook for keyboard inputdev driver */
void (*atari_input_keyboard_interrupt_hook) (unsigned char, char);
/* Hook for mouse inputdev driver */
void (*atari_input_mouse_interrupt_hook) (char *);
EXPORT_SYMBOL(atari_mouse_interrupt_hook);
EXPORT_SYMBOL(atari_input_keyboard_interrupt_hook);
EXPORT_SYMBOL(atari_input_mouse_interrupt_hook);

Expand Down Expand Up @@ -263,8 +260,8 @@ static irqreturn_t atari_keyboard_interrupt(int irq, void *dummy)
kb_state.buf[kb_state.len++] = scancode;
if (kb_state.len == 3) {
kb_state.state = KEYBOARD;
if (atari_mouse_interrupt_hook)
atari_mouse_interrupt_hook(kb_state.buf);
if (atari_input_mouse_interrupt_hook)
atari_input_mouse_interrupt_hook(kb_state.buf);
}
break;

Expand Down
2 changes: 0 additions & 2 deletions arch/m68k/include/asm/atarikb.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ void ikbd_joystick_disable(void);

/* Hook for MIDI serial driver */
extern void (*atari_MIDI_interrupt_hook) (void);
/* Hook for mouse driver */
extern void (*atari_mouse_interrupt_hook) (char *);
/* Hook for keyboard inputdev driver */
extern void (*atari_input_keyboard_interrupt_hook) (unsigned char, char);
/* Hook for mouse inputdev driver */
Expand Down
2 changes: 1 addition & 1 deletion drivers/input/mouse/atarimouse.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ static int atamouse_open(struct input_dev *dev)
static void atamouse_close(struct input_dev *dev)
{
ikbd_mouse_disable();
atari_mouse_interrupt_hook = NULL;
atari_input_mouse_interrupt_hook = NULL;
}

static int __init atamouse_init(void)
Expand Down

0 comments on commit 7786908

Please sign in to comment.