| From 31b5929d533f5183972cf57a7844b456ed996f3c Mon Sep 17 00:00:00 2001 |
| From: "Maciej S. Szmigiero" <mail@maciej.szmigiero.name> |
| Date: Wed, 16 Nov 2016 00:55:57 +0100 |
| Subject: vt: fix Scroll Lock LED trigger name |
| |
| From: Maciej S. Szmigiero <mail@maciej.szmigiero.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> |
| |
| --- |
| drivers/tty/vt/keyboard.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/tty/vt/keyboard.c |
| +++ b/drivers/tty/vt/keyboard.c |
| @@ -982,7 +982,7 @@ static void kbd_led_trigger_activate(str |
| KBD_LED_TRIGGER((_led_bit) + 8, _name) |
| |
| static struct kbd_led_trigger kbd_led_triggers[] = { |
| - KBD_LED_TRIGGER(VC_SCROLLOCK, "kbd-scrollock"), |
| + KBD_LED_TRIGGER(VC_SCROLLOCK, "kbd-scrolllock"), |
| KBD_LED_TRIGGER(VC_NUMLOCK, "kbd-numlock"), |
| KBD_LED_TRIGGER(VC_CAPSLOCK, "kbd-capslock"), |
| KBD_LED_TRIGGER(VC_KANALOCK, "kbd-kanalock"), |
