diff options
author | Maciej S. Szmigiero <mail@maciej.szmigiero.name> | 2016-11-15 18:55:57 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-09 02:32:21 -0500 |
commit | fbb28e76454fd7b9c59e5e35702982ee6d0dae8b (patch) | |
tree | 177fb5af76eaf8333b21fa14f256c44938bc3ab2 | |
parent | 11aa5c10102a425dde885b6b056e1fe354bcbb88 (diff) |
vt: fix Scroll Lock LED trigger name
commit 31b5929d533f5183972cf57a7844b456ed996f3c upstream.
There is a disagreement between drivers/tty/vt/keyboard.c and
drivers/input/input-leds.c with regard to what is a Scroll Lock LED
trigger name: input calls it "kbd-scrolllock", but vt calls it
"kbd-scrollock" (two l's).
This prevents Scroll Lock LED trigger from binding to this LED by default.
Since it is a scroLL Lock LED, this interface was introduced only about a
year ago and in an Internet search people seem to reference this trigger
only to set it to this LED let's simply rename it to "kbd-scrolllock".
Also, it looks like this was supposed to be changed before this code was
merged: https://lkml.org/lkml/2015/6/9/697 but it was done only on
the input side.
Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/tty/vt/keyboard.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c index 0f8caae4267d..ece10e6b731b 100644 --- a/drivers/tty/vt/keyboard.c +++ b/drivers/tty/vt/keyboard.c | |||
@@ -982,7 +982,7 @@ static void kbd_led_trigger_activate(struct led_classdev *cdev) | |||
982 | KBD_LED_TRIGGER((_led_bit) + 8, _name) | 982 | KBD_LED_TRIGGER((_led_bit) + 8, _name) |
983 | 983 | ||
984 | static struct kbd_led_trigger kbd_led_triggers[] = { | 984 | static struct kbd_led_trigger kbd_led_triggers[] = { |
985 | KBD_LED_TRIGGER(VC_SCROLLOCK, "kbd-scrollock"), | 985 | KBD_LED_TRIGGER(VC_SCROLLOCK, "kbd-scrolllock"), |
986 | KBD_LED_TRIGGER(VC_NUMLOCK, "kbd-numlock"), | 986 | KBD_LED_TRIGGER(VC_NUMLOCK, "kbd-numlock"), |
987 | KBD_LED_TRIGGER(VC_CAPSLOCK, "kbd-capslock"), | 987 | KBD_LED_TRIGGER(VC_CAPSLOCK, "kbd-capslock"), |
988 | KBD_LED_TRIGGER(VC_KANALOCK, "kbd-kanalock"), | 988 | KBD_LED_TRIGGER(VC_KANALOCK, "kbd-kanalock"), |