tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

input/atari: Use the correct mouse interrupt hook

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>

authored by

Michael Schmitz and committed by
Geert Uytterhoeven 7786908c 79abeed6

+3 -8
+2 -5
arch/m68k/atari/atakeyb.c
··· 36 36 37 37 /* Hook for MIDI serial driver */ 38 38 void (*atari_MIDI_interrupt_hook) (void); 39 - /* Hook for mouse driver */ 40 - void (*atari_mouse_interrupt_hook) (char *); 41 39 /* Hook for keyboard inputdev driver */ 42 40 void (*atari_input_keyboard_interrupt_hook) (unsigned char, char); 43 41 /* Hook for mouse inputdev driver */ 44 42 void (*atari_input_mouse_interrupt_hook) (char *); 45 - EXPORT_SYMBOL(atari_mouse_interrupt_hook); 46 43 EXPORT_SYMBOL(atari_input_keyboard_interrupt_hook); 47 44 EXPORT_SYMBOL(atari_input_mouse_interrupt_hook); 48 45 ··· 260 263 kb_state.buf[kb_state.len++] = scancode; 261 264 if (kb_state.len == 3) { 262 265 kb_state.state = KEYBOARD; 263 - if (atari_mouse_interrupt_hook) 264 - atari_mouse_interrupt_hook(kb_state.buf); 266 + if (atari_input_mouse_interrupt_hook) 267 + atari_input_mouse_interrupt_hook(kb_state.buf); 265 268 } 266 269 break; 267 270
-2
arch/m68k/include/asm/atarikb.h
··· 34 34 35 35 /* Hook for MIDI serial driver */ 36 36 extern void (*atari_MIDI_interrupt_hook) (void); 37 - /* Hook for mouse driver */ 38 - extern void (*atari_mouse_interrupt_hook) (char *); 39 37 /* Hook for keyboard inputdev driver */ 40 38 extern void (*atari_input_keyboard_interrupt_hook) (unsigned char, char); 41 39 /* Hook for mouse inputdev driver */
+1 -1
drivers/input/mouse/atarimouse.c
··· 108 108 static void atamouse_close(struct input_dev *dev) 109 109 { 110 110 ikbd_mouse_disable(); 111 - atari_mouse_interrupt_hook = NULL; 111 + atari_input_mouse_interrupt_hook = NULL; 112 112 } 113 113 114 114 static int __init atamouse_init(void)