aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-11-02 14:32:00 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-21 09:40:00 -0700
commitd1e6e65a8d800bc91fb2389a33f2d9d8447bcfbd (patch)
tree4c8114d29f1e3d90e7b1bb7edb59ca3905a7c012 /drivers/platform
parentf1aadd585872545e03701a91b1f2e9d66a35d5d3 (diff)
downloadkernel_samsung_smdk4412-d1e6e65a8d800bc91fb2389a33f2d9d8447bcfbd.zip
kernel_samsung_smdk4412-d1e6e65a8d800bc91fb2389a33f2d9d8447bcfbd.tar.gz
kernel_samsung_smdk4412-d1e6e65a8d800bc91fb2389a33f2d9d8447bcfbd.tar.bz2
sony-laptop: Enable keyboard backlight by default
commit 6fe6ae56a7cebaebc2e6daa11c423e4692f9b592 upstream. When the keyboard backlight support was originally added, the commit said to default it to on with a 10 second timeout. That actually wasn't the case, as the default value is commented out for the kbd_backlight parameter. Because it is a static variable, it gets set to 0 by default without some other form of initialization. However, it seems the function to set the value wasn't actually called immediately, so whatever state the keyboard was in initially would remain. Then commit df410d522410e67660 was introduced during the 2.6.39 timeframe to immediately set whatever value was present (as well as attempt to restore/reset the state on module removal or resume). That seems to have now forced the light off immediately when the module is loaded unless the option kbd_backlight=1 is specified. Let's enable it by default again (for the first time). This should solve https://bugzilla.redhat.com/show_bug.cgi?id=728478 Signed-off-by: Josh Boyer <jwboyer@redhat.com> Acked-by: Mattia Dongili <malattia@linux.it> Signed-off-by: Matthew Garrett <mjg@redhat.com> Cc: maximilian attems <max@stro.at> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/sony-laptop.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index bbd182e..35dae41 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -127,7 +127,7 @@ MODULE_PARM_DESC(minor,
"default is -1 (automatic)");
#endif
-static int kbd_backlight; /* = 1 */
+static int kbd_backlight = 1;
module_param(kbd_backlight, int, 0444);
MODULE_PARM_DESC(kbd_backlight,
"set this to 0 to disable keyboard backlight, "