diff options
authorMichael Spang <>2009-03-12 14:31:34 -0700
committerLinus Torvalds <>2009-03-12 16:20:24 -0700
commit1ba869ec581fd9078b684c56c399ffe3d2345e27 (patch)
parent7c48ed3383bfb2106694807361ec187fe8a4333d (diff)
acer-wmi: fix regression in backlight detection
Currently we disable the Acer WMI backlight device if there is no ACPI backlight device. As a result, we end up with no backlight device at all. We should instead disable it if there is an ACPI device, as the other laptop drivers do. This regression was introduced in febf2d9 ("Acer-WMI: fingers off backlight if video.ko is serving this functionality"). Each laptop driver with backlight support got a similar change around febf2d9. The changes to the other drivers look correct; see e.g. a598c82f for a similar but correct change. The regression is also in 2.6.28. Signed-off-by: Michael Spang <> Acked-by: Thomas Renninger <> Cc: Zhang Rui <> Cc: Andi Kleen <> Cc: Carlos Corbacho <> Cc: Len Brown <> Cc: "Rafael J. Wysocki" <> Cc: <> [2.6.28.x] Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
index 94c9f911824e..6bcca616a704 100644
--- a/drivers/platform/x86/acer-wmi.c
+++ b/drivers/platform/x86/acer-wmi.c
@@ -1297,7 +1297,7 @@ static int __init acer_wmi_init(void)
- if (!acpi_video_backlight_support() && has_cap(ACER_CAP_BRIGHTNESS)) {
+ if (acpi_video_backlight_support() && has_cap(ACER_CAP_BRIGHTNESS)) {
interface->capability &= ~ACER_CAP_BRIGHTNESS;
printk(ACER_INFO "Brightness must be controlled by "
"generic video driver\n");