From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 23 Jul 2013 01:58:07 +0000 (+0200)
Subject: Merge branch 'acpi-cleanup'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b9eb179fe6d9acc11a54194d2df147e991f049aa;p=linux-beck.git

Merge branch 'acpi-cleanup'

Subsequent commits depend on the 'acpi-cleanup' material.
---

b9eb179fe6d9acc11a54194d2df147e991f049aa
diff --cc drivers/acpi/video.c
index 6dd237e79b4f,b862c7f74941..f1fb2429dbb0
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@@ -904,14 -881,10 +891,13 @@@ static void acpi_video_device_find_cap(
  		device->cap._BCQ = 1;
  	}
  
- 	if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_DDC", &h_dummy1))) {
+ 	if (acpi_has_method(device->dev->handle, "_DDC"))
  		device->cap._DDC = 1;
- 	}
  
 -	if (acpi_video_backlight_support()) {
 +	if (acpi_video_init_brightness(device))
 +		return;
 +
 +	if (acpi_video_verify_backlight_support()) {
  		struct backlight_properties props;
  		struct pci_dev *pdev;
  		acpi_handle acpi_parent;