Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7786908c authored by Michael Schmitz's avatar Michael Schmitz Committed by Geert Uytterhoeven
Browse files

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: default avatarMichael Schmitz <schmitz@debian.org>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 79abeed6

arch/m68k/atari/atakeyb.c

+2 −5
Original line number Diff line number Diff line
@@ -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);
@@ -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;

arch/m68k/include/asm/atarikb.h

+0 −2
Original line number Diff line number Diff line
@@ -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 */

drivers/input/mouse/atarimouse.c

+1 −1
Original line number Diff line number Diff line
@@ -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)