]>
Commit | Line | Data |
---|---|---|
2cb7cef9 BS |
1 | From: Thomas Renninger <trenn@suse.de> |
2 | Subject: [PATCH] eeepc-laptop: fingers off backlight if video.ko is serving this functionality | |
3 | commit bb7e1665304cba64b1178237c966308d06b33182 | |
4 | ||
5 | Signed-off-by: Thomas Renninger <trenn@suse.de> | |
6 | Signed-off-by: Andi Kleen <ak@linux.intel.com> | |
7 | --- | |
8 | drivers/misc/eeepc-laptop.c | 12 +++++++++--- | |
9 | 1 file changed, 9 insertions(+), 3 deletions(-) | |
10 | ||
11 | --- a/drivers/misc/eeepc-laptop.c | |
12 | +++ b/drivers/misc/eeepc-laptop.c | |
13 | @@ -636,9 +636,15 @@ static int __init eeepc_laptop_init(void | |
14 | return -ENODEV; | |
15 | } | |
16 | dev = acpi_get_physical_device(ehotk->device->handle); | |
17 | - result = eeepc_backlight_init(dev); | |
18 | - if (result) | |
19 | - goto fail_backlight; | |
20 | + | |
21 | + if (!acpi_video_backlight_support()) { | |
22 | + result = eeepc_backlight_init(dev); | |
23 | + if (result) | |
24 | + goto fail_backlight; | |
25 | + } else | |
26 | + printk(EEEPC_INFO "Backlight controlled by ACPI video " | |
27 | + "driver\n"); | |
28 | + | |
29 | result = eeepc_hwmon_init(dev); | |
30 | if (result) | |
31 | goto fail_hwmon; |