]>
Commit | Line | Data |
---|---|---|
00e5a55c BS |
1 | From: Thomas Renninger <trenn@suse.de> |
2 | Subject: [PATCH] asus-acpi: fingers off backlight if video.ko is serving this functionality | |
3 | Patch-Mainline: queued for .28 in Len's/ak's ACPI tree | |
4 | ||
5 | commit aaa47082a287d66fad32e3289e01bb9419ab18da | |
6 | ||
7 | Signed-off-by: Thomas Renninger <trenn@suse.de> | |
8 | Signed-off-by: Andi Kleen <ak@linux.intel.com> | |
9 | --- | |
10 | drivers/misc/asus-laptop.c | 10 +++++++--- | |
11 | 1 file changed, 7 insertions(+), 3 deletions(-) | |
12 | ||
13 | --- a/drivers/misc/asus-laptop.c | |
14 | +++ b/drivers/misc/asus-laptop.c | |
15 | @@ -1208,9 +1208,13 @@ static int __init asus_laptop_init(void) | |
16 | ||
17 | dev = acpi_get_physical_device(hotk->device->handle); | |
18 | ||
19 | - result = asus_backlight_init(dev); | |
20 | - if (result) | |
21 | - goto fail_backlight; | |
22 | + if (!acpi_video_backlight_support()) { | |
23 | + result = asus_backlight_init(dev); | |
24 | + if (result) | |
25 | + goto fail_backlight; | |
26 | + } else | |
27 | + printk(ASUS_INFO "Brightness ignored, must be controlled by " | |
28 | + "ACPI video driver\n"); | |
29 | ||
30 | result = asus_led_init(dev); | |
31 | if (result) |