summaryrefslogtreecommitdiffstats
path: root/thinkpad-acpi-fix-backlight.patch
diff options
context:
space:
mode:
authorJesse Keating <jkeating@redhat.com>2010-07-29 16:46:31 -0700
committerJesse Keating <jkeating@redhat.com>2010-07-29 16:46:31 -0700
commit7a32965a104c3363e8505fe566531fcf071cced7 (patch)
treee45cb84552b2b022f49047bbddd9d887753c35bc /thinkpad-acpi-fix-backlight.patch
parent64ba2e5ffde5f2418eb26c700cb0ab62b04e5013 (diff)
downloadkernel-7a32965a104c3363e8505fe566531fcf071cced7.tar.gz
kernel-7a32965a104c3363e8505fe566531fcf071cced7.tar.xz
kernel-7a32965a104c3363e8505fe566531fcf071cced7.zip
initial srpm import
Diffstat (limited to 'thinkpad-acpi-fix-backlight.patch')
-rw-r--r--thinkpad-acpi-fix-backlight.patch56
1 files changed, 56 insertions, 0 deletions
diff --git a/thinkpad-acpi-fix-backlight.patch b/thinkpad-acpi-fix-backlight.patch
new file mode 100644
index 000000000..5ed2544fe
--- /dev/null
+++ b/thinkpad-acpi-fix-backlight.patch
@@ -0,0 +1,56 @@
+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");
+ }
+ }
+