From d3844ec6fb099d835a91e6159b835a07afec034d Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Sun, 29 Nov 2009 23:40:58 -0800 Subject: [PATCH] --- yaml --- r: 174254 b: refs/heads/master c: 21cea58e49cf59e7c77ce2a01be432458e9f99a9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/keyboard.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 318812b3bd5d..1ade03f1a77b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dbe1420b4ba398feef035f7cd8181ec2e492228b +refs/heads/master: 21cea58e49cf59e7c77ce2a01be432458e9f99a9 diff --git a/trunk/drivers/char/keyboard.c b/trunk/drivers/char/keyboard.c index 747683f055ed..ca090e57e161 100644 --- a/trunk/drivers/char/keyboard.c +++ b/trunk/drivers/char/keyboard.c @@ -132,6 +132,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; @@ -1296,10 +1297,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, just take the lock */ + 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();