Blob Blame Raw
diff -up linux-2.6.32.noarch/drivers/platform/x86/thinkpad_acpi.c.orig linux-2.6.32.noarch/drivers/platform/x86/thinkpad_acpi.c
--- linux-2.6.32.noarch/drivers/platform/x86/thinkpad_acpi.c.orig	2010-05-17 16:18:05.748224844 -0400
+++ linux-2.6.32.noarch/drivers/platform/x86/thinkpad_acpi.c	2010-05-17 16:25:58.299199699 -0400
@@ -3387,7 +3387,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 "
@@ -6178,26 +6178,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");
 		}
 	}