diff options
| author | Christopher Brannon | 2012-06-22 15:16:34 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-07-06 23:28:17 +0200 |
| commit | 157a4b311c45c9aba75a990464d9680867dc8805 (patch) | |
| tree | 78c3cdd4f387121e7db5988aec9310e8c627c127 /drivers/tty/vt | |
| parent | tty: localise the lock (diff) | |
| download | kernel-qcow2-linux-157a4b311c45c9aba75a990464d9680867dc8805.tar.gz kernel-qcow2-linux-157a4b311c45c9aba75a990464d9680867dc8805.tar.xz kernel-qcow2-linux-157a4b311c45c9aba75a990464d9680867dc8805.zip | |
tty: keyboard.c: Remove locking from vt_get_leds.
There are three call sites for this function, and all three
are called within a keyboard handler.
kbd_event_lock is already held within keyboard handlers,
so attempting to lock it in vt_get_leds causes deadlock.
Signed-off-by: Christopher Brannon <chris@the-brannons.com>
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/vt')
| -rw-r--r-- | drivers/tty/vt/keyboard.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c index 0b6217c93036..9b4f60a6ab0e 100644 --- a/drivers/tty/vt/keyboard.c +++ b/drivers/tty/vt/keyboard.c @@ -1049,13 +1049,10 @@ static int kbd_update_leds_helper(struct input_handle *handle, void *data) */ int vt_get_leds(int console, int flag) { - unsigned long flags; struct kbd_struct * kbd = kbd_table + console; int ret; - spin_lock_irqsave(&kbd_event_lock, flags); ret = vc_kbd_led(kbd, flag); - spin_unlock_irqrestore(&kbd_event_lock, flags); return ret; } |