rpms/kernel/devel thinkpad-acpi-fix-backlight.patch, NONE, 1.1 kernel.spec, 1.1993, 1.1994

[Matthew Garrett]

Author: mjg59

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13938

Modified Files:
	kernel.spec 
Added Files:
	thinkpad-acpi-fix-backlight.patch 
Log Message:
* Mon May 17 2010 Matthew Garrett <mjg at redhat.com>
- thinkpad-acpi-fix-backlight.patch: Fix backlight support on some recent
   Thinkpads


thinkpad-acpi-fix-backlight.patch:
 thinkpad_acpi.c |   38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

--- NEW FILE thinkpad-acpi-fix-backlight.patch ---
diff -up linux-2.6.34.noarch/drivers/platform/x86/thinkpad_acpi.c.orig linux-2.6.34.noarch/drivers/platform/x86/thinkpad_acpi.c
--- linux-2.6.34.noarch/drivers/platform/x86/thinkpad_acpi.c.orig	2010-05-17 16:28:13.254200070 -0400
+++ linux-2.6.34.noarch/drivers/platform/x86/thinkpad_acpi.c	2010-05-17 16:29:56.471200083 -0400
@@ -3397,7 +3397,7 @@ static int __init hotkey_init(struct ibm
 		/* update bright_acpimode... */
 		tpacpi_check_std_acpi_brightness_support();
 
-	if (tp_features.bright_acpimode && acpi_video_backlight_support()) {
+	if (acpi_video_backlight_support()) {
 		printk(TPACPI_INFO
 		       "This ThinkPad has standard ACPI backlight "
 		       "brightness control, supported by the ACPI "
@@ -6189,26 +6189,24 @@ static int __init brightness_init(struct
 	 * going to publish a backlight interface
 	 */
 	b = tpacpi_check_std_acpi_brightness_support();
-	if (b > 0) {
 
-		if (acpi_video_backlight_support()) {
-			if (brightness_enable > 1) {
-				printk(TPACPI_NOTICE
-				       "Standard ACPI backlight interface "
-				       "available, not loading native one.\n");
-				return 1;
-			} else if (brightness_enable == 1) {
-				printk(TPACPI_NOTICE
-				       "Backlight control force enabled, even if standard "
-				       "ACPI backlight interface is available\n");
-			}
-		} else {
-			if (brightness_enable > 1) {
-				printk(TPACPI_NOTICE
-				       "Standard ACPI backlight interface not "
-				       "available, thinkpad_acpi native "
-				       "brightness control enabled\n");
-			}
+	if (acpi_video_backlight_support()) {
+		if (brightness_enable > 1) {
+			printk(TPACPI_NOTICE
+			       "Standard ACPI backlight interface "
+			       "available, not loading native one.\n");
+			return 1;
+		} else if (brightness_enable == 1) {
+			printk(TPACPI_NOTICE
+			       "Backlight control force enabled, even if standard "
+			       "ACPI backlight interface is available\n");
+		}
+	} else {
+		if (brightness_enable > 1) {
+			printk(TPACPI_NOTICE
+			       "Standard ACPI backlight interface not "
+			       "available, thinkpad_acpi native "
+			       "brightness control enabled\n");
 		}
 	}
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1993
retrieving revision 1.1994
diff -u -p -r1.1993 -r1.1994
--- kernel.spec	17 May 2010 03:41:14 -0000	1.1993
+++ kernel.spec	17 May 2010 20:38:21 -0000	1.1994
@@ -674,6 +674,7 @@ Patch391: linux-2.6-acpi-video-dos.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch452: linux-2.6.30-no-pcspkr-modalias.patch
 Patch453: thinkpad-acpi-add-x100e.patch
+Patch454: thinkpad-acpi-fix-backlight.patch
 
 Patch460: linux-2.6-serial-460800.patch
 
@@ -1269,6 +1270,7 @@ ApplyPatch die-floppy-die.patch
 ApplyPatch linux-2.6.30-no-pcspkr-modalias.patch
 
 ApplyPatch thinkpad-acpi-add-x100e.patch
+ApplyPatch thinkpad-acpi-fix-backlight.patch
 
 # Allow to use 480600 baud on 16C950 UARTs
 ApplyPatch linux-2.6-serial-460800.patch
@@ -2025,6 +2027,10 @@ fi
 #                 ||     ||
 
 %changelog
+* Mon May 17 2010 Matthew Garrett <mjg at redhat.com>
+- thinkpad-acpi-fix-backlight.patch: Fix backlight support on some recent
+   Thinkpads
+
 * Sun May 16 2010 Kyle McMartin <kyle at redhat.com> 2.6.34-2
 - Disable strict copy_from_user checking until lirc is fixed.