diff options
Diffstat (limited to 'drivers/misc/asus-laptop.c')
| -rw-r--r-- | drivers/misc/asus-laptop.c | 10 | 
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/misc/asus-laptop.c b/drivers/misc/asus-laptop.c index a9d5228724a..8fb8b359104 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)  |