Input: keyboard - add locking around event handling
diff mbox

Message ID 20091119071315.GD3010@core.coreip.homeip.net
State New, archived
Headers show

Commit Message

Dmitry Torokhov Nov. 19, 2009, 7:13 a.m. UTC
None

Patch
diff mbox

diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c
index ce2ab67..e095ff3 100644
--- a/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
@@ -130,6 +130,7 @@  int shift_state = 0;
  */
 
 static struct input_handler kbd_handler;
+static DEFINE_SPINLOCK(kbd_event_lock);
 static unsigned long key_down[BITS_TO_LONGS(KEY_CNT)];	/* keyboard key bitmap */
 static unsigned char shift_down[NR_SHIFT];		/* shift state counters.. */
 static int dead_key_next;
@@ -1304,11 +1305,16 @@  static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
 static void kbd_event(struct input_handle *handle, unsigned int event_type,
 		      unsigned int event_code, int value)
 {
+	/* We are called with interrupts disabled */
+	spin_lock(&kbd_event_lock);
+
 	if (event_type == EV_MSC && event_code == MSC_RAW && HW_RAW(handle->dev))
 		kbd_rawcode(value);
 	if (event_type == EV_KEY)
 		kbd_keycode(event_code, value, HW_RAW(handle->dev));
 
+	spin_unlock(&kbd_event_lock);
+
 	tasklet_schedule(&keyboard_tasklet);
 	do_poke_blanked_console = 1;
 	schedule_console_callback();