Merge branch 'bugzilla-13671' into release

git-mirror · Dec 30, 2009 · b943aa8 · b943aa8
2 parents ea840aa + 28c32e9
commit b943aa8
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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;