summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2012-05-14 15:41:31 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-14 19:43:24 +0200
commiteea41aee2bfad4cf5c84e1cab8aa068c66206651 (patch)
tree6da3eaa10d8548f6770e4566e139b1128706ded7 /drivers/tty
parentMerge tag 'for-linus-3.4-20120513' of git://git.infradead.org/linux-mtd (diff)
downloadlinux-eea41aee2bfad4cf5c84e1cab8aa068c66206651.tar.xz
linux-eea41aee2bfad4cf5c84e1cab8aa068c66206651.zip
tty: Fix LED error return
3.4-rc introduced a regression when setting the LEDS. We do the right thing but then return an error code. Resolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id=43144 Reported-by: Christian Casteyde Signed-off-by: Alan Cox <alan@linux/intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/vt/keyboard.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
index 29ca20dbd335..3b0c4e32ed7b 100644
--- a/drivers/tty/vt/keyboard.c
+++ b/drivers/tty/vt/keyboard.c
@@ -2044,7 +2044,7 @@ int vt_do_kdskled(int console, int cmd, unsigned long arg, int perm)
kbd->default_ledflagstate = ((arg >> 4) & 7);
set_leds();
spin_unlock_irqrestore(&kbd_event_lock, flags);
- break;
+ return 0;
/* the ioctls below only set the lights, not the functions */
/* for those, see KDGKBLED and KDSKBLED above */