Skip to content

Commit

Permalink
eeepc-laptop: fingers off backlight if video.ko is serving this funct…
Browse files Browse the repository at this point in the history
…ionality

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 29454f1 commit a2bf8c0
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions drivers/misc/eeepc-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -825,9 +825,15 @@ static int __init eeepc_laptop_init(void)
return -ENODEV;
}
dev = acpi_get_physical_device(ehotk->device->handle);
result = eeepc_backlight_init(dev);
if (result)
goto fail_backlight;

if (!acpi_video_backlight_support()) {
result = eeepc_backlight_init(dev);
if (result)
goto fail_backlight;
} else
printk(EEEPC_INFO "Backlight controlled by ACPI video "
"driver\n");

result = eeepc_hwmon_init(dev);
if (result)
goto fail_hwmon;
Expand Down

0 comments on commit a2bf8c0

Please sign in to comment.