From ee777ec97734953e1398fee557b66e3611a9973f Mon Sep 17 00:00:00 2001 From: Thomas Renninger Date: Fri, 1 Aug 2008 17:37:57 +0200 Subject: [PATCH] --- yaml --- r: 118814 b: refs/heads/master c: 6766fec3669d5053b987e111afb348b885237bfc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/misc/asus-laptop.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a9a2b83b404e..5205fd7d9748 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: febf2d95a71cd594182e4b3defb0e0ffdfe61482 +refs/heads/master: 6766fec3669d5053b987e111afb348b885237bfc diff --git a/trunk/drivers/misc/asus-laptop.c b/trunk/drivers/misc/asus-laptop.c index a9d5228724a6..8fb8b3591048 100644 --- a/trunk/drivers/misc/asus-laptop.c +++ b/trunk/drivers/misc/asus-laptop.c @@ -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)