Merge tag 'tty-4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[platform/kernel/linux-rpi.git] / drivers / tty / vt / keyboard.c

diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
index c0f5802..88312c6 100644 (file)
--- a/drivers/tty/vt/keyboard.c
+++ b/drivers/tty/vt/keyboard.c
@@ -987,7 +987,7 @@ struct kbd_led_trigger {
        unsigned int mask;
 };
 
-static void kbd_led_trigger_activate(struct led_classdev *cdev)
+static int kbd_led_trigger_activate(struct led_classdev *cdev)
 {
        struct kbd_led_trigger *trigger =
                container_of(cdev->trigger, struct kbd_led_trigger, trigger);
@@ -998,6 +998,8 @@ static void kbd_led_trigger_activate(struct led_classdev *cdev)
                                  ledstate & trigger->mask ?
                                        LED_FULL : LED_OFF);
        tasklet_enable(&keyboard_tasklet);
+
+       return 0;
 }
 
 #define KBD_LED_TRIGGER(_led_bit, _name) {                     \