diff --git a/kernel.spec b/kernel.spec index 9b604263e..2b0a9d81c 100644 --- a/kernel.spec +++ b/kernel.spec @@ -54,7 +54,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 2 +%global baserelease 3 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -815,6 +815,14 @@ Patch21235: scsi-fix-sd_revalidate_disk-oops.patch #rhbz 790367 Patch21239: s390x-enable-keys-compat.patch +#rhbz 727865 730007 +Patch21240: ACPICA-Fix-regression-in-FADT-revision-checks.patch + +Patch21241: cifs-fix-dentry-refcount-leak-when-opening-a-FIFO.patch + +#rhbz 728478 +Patch21242: sony-laptop-Enable-keyboard-backlight-by-default.patch + # compat-wireless patches Patch50000: compat-wireless-config-fixups.patch Patch50001: compat-wireless-pr_fmt-warning-avoidance.patch @@ -856,10 +864,7 @@ Patch50132: mac80211-zero-initialize-count-field-in-ieee80211_tx.patch Patch50133: mac80211-Fix-a-warning-on-changing-to-monitor-mode-f.patch Patch50134: brcm80211-smac-fix-endless-retry-of-A-MPDU-transmiss.patch Patch50135: brcm80211-smac-only-print-block-ack-timeout-message-.patch -Patch50136: cifs-fix-dentry-refcount-leak-when-opening-a-FIFO.patch -#rhbz 727865 730007 -Patch21102: ACPICA-Fix-regression-in-FADT-revision-checks.patch %endif @@ -1562,6 +1567,9 @@ ApplyPatch ACPICA-Fix-regression-in-FADT-revision-checks.patch #rhbz 798296 ApplyPatch cifs-fix-dentry-refcount-leak-when-opening-a-FIFO.patch +#rhbz 728478 +ApplyPatch sony-laptop-Enable-keyboard-backlight-by-default.patch + # END OF PATCH APPLICATIONS %endif @@ -2378,6 +2386,9 @@ fi # and build. %changelog +* Tue Feb 28 2012 Josh Boyer 3.2.8-3 +- Add patch to enable keyboard backlight on Sony laptops (rhbz 728478) + * Tue Feb 28 2012 Justin M. Forbes 3.2.8-2 - CVE-2012-1090 CIFS: fix dentry refcount leak when opening a FIFO on lookup (rhbz 798296) diff --git a/sony-laptop-Enable-keyboard-backlight-by-default.patch b/sony-laptop-Enable-keyboard-backlight-by-default.patch new file mode 100644 index 000000000..c993fd86d --- /dev/null +++ b/sony-laptop-Enable-keyboard-backlight-by-default.patch @@ -0,0 +1,44 @@ +From 0dbc2bc96b1ec741bdd43451c286ccd45da3310b Mon Sep 17 00:00:00 2001 +From: Josh Boyer +Date: Wed, 2 Nov 2011 14:31:59 -0400 +Subject: [PATCH] sony-laptop: Enable keyboard backlight by default + +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 + +Acked-by: Mattia Dongili +Signed-off-by: Josh Boyer +--- + drivers/platform/x86/sony-laptop.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c +index c006dee..40c4705 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, " +-- +1.7.7.6 +