tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'acpi-3.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/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

Linus Torvalds 25e33ed9 cb03dc09

+4 -4
+1 -4
drivers/acpi/scan.c
··· 1017 1017 return -ENOSYS; 1018 1018 1019 1019 result = driver->ops.add(device); 1020 - if (result) { 1021 - device->driver = NULL; 1022 - device->driver_data = NULL; 1020 + if (result) 1023 1021 return result; 1024 - } 1025 1022 1026 1023 device->driver = driver; 1027 1024
+3
drivers/acpi/video.c
··· 1722 1722 int error; 1723 1723 acpi_status status; 1724 1724 1725 + if (device->handler) 1726 + return -EINVAL; 1727 + 1725 1728 status = acpi_walk_namespace(ACPI_TYPE_DEVICE, 1726 1729 device->parent->handle, 1, 1727 1730 acpi_video_bus_match, NULL,