Commit 1ba869ec authored by Michael Spang's avatar Michael Spang Committed by Linus Torvalds

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 febf2d95 ("Acer-WMI:
fingers off backlight if video.ko is serving this functionality").

Each laptop driver with backlight support got a similar change around
febf2d95.  The changes to the other drivers look correct; see e.g.
a598c82f for a similar but correct change.  The regression is also in
Signed-off-by: default avatarMichael Spang <>
Acked-by: default avatarThomas 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: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent 7c48ed33
......@@ -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");
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment