Merge branch 'bugzilla-13671' into release

2009-12-30 02:51:31 -05:00 · 2009-12-30 02:51:31 -05:00 · b943aa83f8
parent ea840aa2d0 28c32e99bd
commit b943aa83f8
1 changed files with 4 additions and 0 deletions
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@ -1979,6 +1979,10 @@ acpi_video_switch_brightness(struct acpi_video_device *device, int event)
 	unsigned long long level_current, level_next;
 	int result = -EINVAL;

+	/* no warning message if acpi_backlight=vendor is used */
+	if (!acpi_video_backlight_support())
+		return 0;
+
 	if (!device->brightness)
 		goto out;