Skip to content

Commit

Permalink
asus-acpi: fingers off backlight if video.ko is serving this function…
Browse files Browse the repository at this point in the history
…ality

Signed-off-by: Thomas Renninger <trenn@suse.de>
Acked-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
  • Loading branch information
Thomas Renninger authored and Len Brown committed Nov 8, 2008
1 parent febf2d9 commit 6766fec
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions drivers/misc/asus-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -1208,9 +1208,13 @@ static int __init asus_laptop_init(void)

dev = acpi_get_physical_device(hotk->device->handle);

result = asus_backlight_init(dev);
if (result)
goto fail_backlight;
if (!acpi_video_backlight_support()) {
result = asus_backlight_init(dev);
if (result)
goto fail_backlight;
} else
printk(ASUS_INFO "Brightness ignored, must be controlled by "
"ACPI video driver\n");

result = asus_led_init(dev);
if (result)
Expand Down

0 comments on commit 6766fec

Please sign in to comment.