From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 29 Jul 2013 13:39:20 +0000 (+0200)
Subject: Merge branch 'acpi-cleanup' into linux-next
X-Git-Tag: next-20130731~69^2~8
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a766f92306b0298e53aa9f8638145e86f0cce588;p=karo-tx-linux.git

Merge branch 'acpi-cleanup' into linux-next

* acpi-cleanup: (21 commits)
  ACPI / dock: fix error return code in dock_add()
  ACPI / dock: Drop unnecessary local variable from dock_add()
  ACPI / dock / PCI: Drop ACPI dock notifier chain
  ACPI / dock: Do not check CONFIG_ACPI_DOCK_MODULE
  ACPI / dock: Do not leak memory on falilures to add a dock station
  ACPI: Drop ACPI bus notifier call chain
  ACPI / dock: Rework the handling of notifications
  ACPI / dock: Simplify dock_init_hotplug() and dock_release_hotplug()
  ACPI / dock: Walk list in reverse order during removal of devices
  ACPI / dock: Rework and simplify find_dock_devices()
  ACPI / dock: Drop the hp_lock mutex from struct dock_station
  ACPI: simplify acpiphp driver with new helper functions
  ACPI: simplify dock driver with new helper functions
  ACPI: Export acpi_(bay)|(dock)_match() from scan.c
  ACPI: introduce two helper functions for _EJ0 and _LCK
  ACPI: introduce helper function acpi_execute_simple_method()
  ACPI: introduce helper function acpi_has_method()
  ACPI / dock: simplify dock_create_acpi_device()
  ACPI / dock: mark initialization functions with __init
  ACPI / dock: drop redundant spin lock in dock station object
  ...
---

a766f92306b0298e53aa9f8638145e86f0cce588
diff --cc drivers/acpi/video.c
index 0ec434d2586d,b862c7f74941..8c6300bdbf5c
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@@ -904,13 -881,9 +891,12 @@@ 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_init_brightness(device))
 +		return;
 +
  	if (acpi_video_backlight_support()) {
  		struct backlight_properties props;
  		struct pci_dev *pdev;