From: Matthew Garrett <matthew.garrett@nebula.com>
Date: Tue, 16 Jul 2013 17:08:16 +0000 (+0000)
Subject: ACPI / video: Always call acpi_video_init_brightness() on init
X-Git-Tag: next-20130717~49^2~3^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2ab019ab1a76e035739d23e734cdc09a076f379a;p=karo-tx-linux.git

ACPI / video: Always call acpi_video_init_brightness() on init

We have to call acpi_video_init_brightness() even if we're not going
to initialise the backlight - Thinkpads seem to use this as the
trigger for enabling ACPI notifications rather than handling it in
firmware.

Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 5d7075d25700..b62bc5d51015 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -898,6 +898,9 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
 		device->cap._DDC = 1;
 	}
 
+	if (acpi_video_init_brightness(device))
+		return;
+
 	if (acpi_video_backlight_support()) {
 		struct backlight_properties props;
 		struct pci_dev *pdev;
@@ -907,9 +910,6 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
 		static int count = 0;
 		char *name;
 
-		result = acpi_video_init_brightness(device);
-		if (result)
-			return;
 		name = kasprintf(GFP_KERNEL, "acpi_video%d", count);
 		if (!name)
 			return;