summaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorThomas Renninger <trenn@suse.de>2008-08-01 17:37:57 +0200
committerLen Brown <len.brown@intel.com>2008-11-08 00:27:26 -0500
commit6766fec3669d5053b987e111afb348b885237bfc (patch)
treeeb7f960141608010180b8778d542dc264ea56fa6 /drivers/misc
parentfebf2d95a71cd594182e4b3defb0e0ffdfe61482 (diff)
downloadop-kernel-dev-6766fec3669d5053b987e111afb348b885237bfc.zip
op-kernel-dev-6766fec3669d5053b987e111afb348b885237bfc.tar.gz
asus-acpi: fingers off backlight if video.ko is serving this functionality
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>
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/asus-laptop.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/misc/asus-laptop.c b/drivers/misc/asus-laptop.c
index a9d5228..8fb8b35 100644
--- a/drivers/misc/asus-laptop.c
+++ b/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)
OpenPOWER on IntegriCloud