summaryrefslogtreecommitdiffstats
path: root/drivers/tty/vt
diff options
context:
space:
mode:
authorChristopher Brannon <chris@the-brannons.com>2012-06-22 08:16:34 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-06 14:28:17 -0700
commit157a4b311c45c9aba75a990464d9680867dc8805 (patch)
tree78c3cdd4f387121e7db5988aec9310e8c627c127 /drivers/tty/vt
parentf5e3bcc504c3c35cc6e06a9ee42efed7c274066b (diff)
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.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
index 0b6217c9303..9b4f60a6ab0 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;
}