sony-laptop: adjust keyboard backlight values for off/auto/on

Keyboard backlight can be always off, use some automatic trigger
(activity and light sensor), always on.
The behaviour of the driver changes whereby previously when passed 1 it
tried to turn on backlight immediately now it does nothing. This is
however a bug fix since (a) it makes little sense to turn on the
backlight when control is automatic and (b) this behaviour is
consistent with what the windows driver does.

Signed-off-by: Javier Achirica <jachirica@gmail.com>
Signed-off-by: Mattia Dongili <malattia@linux.it>
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>

diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index ba39a29a9f39e2a7e8a81aafceea8a2138286fee..48e7e5bdadbfc4af802d0d7c4b210cc0ca8bfb12 100644 (file)
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -129,7 +129,8 @@ static int kbd_backlight = -1;
 module_param(kbd_backlight, int, 0444);
 MODULE_PARM_DESC(kbd_backlight,
                 "set this to 0 to disable keyboard backlight, "
-                "1 to enable it (default: no change from current value)");
+                "1 to enable it with automatic control and 2 to have it always "
+                "on (default: no change from current value)");
 
 static int kbd_backlight_timeout = -1;
 module_param(kbd_backlight_timeout, int, 0444);
@@ -1772,7 +1773,7 @@ static ssize_t __sony_nc_kbd_backlight_mode_set(u8 value)
 {
        int result;
 
-       if (value > 1)
+       if (value > 2)
                return -EINVAL;
 
        if (sony_call_snc_handle(kbdbl_ctl->handle,
@@ -1780,8 +1781,10 @@ static ssize_t __sony_nc_kbd_backlight_mode_set(u8 value)
                return -EIO;
 
        /* Try to turn the light on/off immediately */
-       sony_call_snc_handle(kbdbl_ctl->handle,
-                       (value << 0x10) | (kbdbl_ctl->base + 0x100), &result);
+       if (value != 1)
+               sony_call_snc_handle(kbdbl_ctl->handle,
+                               (value << 0x0f) | (kbdbl_ctl->base + 0x100),
+                               &result);
 
        kbdbl_ctl->mode = value;