Commit 25e33ed9 authored Jun 13, 2013 by Linus Torvalds

linux-pm

Pull ACPI fix from Rafael Wysocki:
 "This is an alternative fix for the regression introduced in 3.9 whose
  previous fix had to be reverted right before 3.10-rc5, because it
  broke one of the Tony's machines.

  In this one the check is confined to the ACPI video driver (which is
  the only one causing the problem to happen in the first place) and the
  Tony's box shouldn't even notice it.

   - ACPI fix for an issue causing ACPI video driver to attempt to bind
     to devices it shouldn't touch from Rafael J Wysocki."

* tag 'acpi-3.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI / video: Do not bind to device objects with a scan handler

parents cb03dc09 8c9b7a7b

drivers/acpi/scan.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -1017,11 +1017,8 @@ acpi_bus_driver_init(struct acpi_device device, struct acpi_driver driver)
		return -ENOSYS;

		result = driver->ops.add(device);
		if (result) {
		device->driver = NULL;
		device->driver_data = NULL;
		if (result)
		return result;
		}

		device->driver = driver;

drivers/acpi/video.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -1722,6 +1722,9 @@ static int acpi_video_bus_add(struct acpi_device *device)
		int error;
		acpi_status status;

		if (device->handler)
		return -EINVAL;

		status = acpi_walk_namespace(ACPI_TYPE_DEVICE,
		device->parent->handle, 1,
		acpi_video_bus_match, NULL,

Admin message