From 601abc76701970568180cd47ea74b3d8ccda4d23 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 10 May 2012 09:28:45 -0700 Subject: [PATCH] 3.0-stable patches added patches: sony-laptop-enable-keyboard-backlight-by-default.patch --- queue-3.0/series | 1 + ...enable-keyboard-backlight-by-default.patch | 47 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 queue-3.0/sony-laptop-enable-keyboard-backlight-by-default.patch diff --git a/queue-3.0/series b/queue-3.0/series index 992ea8dd23f..ebef67824bd 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -17,3 +17,4 @@ sky2-fix-receive-length-error-in-mixed-non-vlan-vlan-traffic.patch tg3-avoid-panic-from-reserved-statblk-field-access.patch sungem-fix-wakeonlan.patch tcp-change-tcp_adv_win_scale-and-tcp_rmem.patch +sony-laptop-enable-keyboard-backlight-by-default.patch diff --git a/queue-3.0/sony-laptop-enable-keyboard-backlight-by-default.patch b/queue-3.0/sony-laptop-enable-keyboard-backlight-by-default.patch new file mode 100644 index 00000000000..c06a2801bd4 --- /dev/null +++ b/queue-3.0/sony-laptop-enable-keyboard-backlight-by-default.patch @@ -0,0 +1,47 @@ +From 6fe6ae56a7cebaebc2e6daa11c423e4692f9b592 Mon Sep 17 00:00:00 2001 +From: Josh Boyer +Date: Wed, 2 Nov 2011 14:32:00 -0400 +Subject: sony-laptop: Enable keyboard backlight by default + +From: Josh Boyer + +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 +Acked-by: Mattia Dongili +Signed-off-by: Matthew Garrett +Cc: maximilian attems +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/platform/x86/sony-laptop.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- 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, " -- 2.47.3