OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ACPI / video: Do not bind to device objects with a scan handler

Browse Source 
With the introduction of ACPI scan handlers, ACPI device objects
with an ACPI scan handler attached to them must not be bound to
by ACPI drivers any more.  Unfortunately, however, the ACPI video
driver attempts to do just that if there is a _ROM ACPI control
method defined under a device object with an ACPI scan handler.

Prevent that from happening by making the video driver's "add"
routine check if the device object already has an ACPI scan handler
attached to it and return an error code in that case.

That is not sufficient, though, because acpi_bus_driver_init() would
then clear the device object's driver_data that may be set by its
scan handler, so for the fix to work acpi_bus_driver_init() has to be
modified to leave driver_data as is on errors.

References: https://bugzilla.kernel.org/show_bug.cgi?id=58091
Bisected-and-tested-by: Dmitry S. Demin <dmitryy.demin@gmail.com>
Reported-and-tested-by: Jason Cassell <bluesloth600@gmail.com>
Tracked-down-by: Aaron Lu <aaron.lu@intel.com>
Cc: 3.9+ <stable@kernel.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Aaron Lu <aaron.lu@intel.com>
This commit is contained in:
Rafael J. Wysocki 2013-06-10 13:00:29 +02:00
parent 317ddd256b
commit 8c9b7a7b2f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/acpi/scan.c
View File

@ -1017,11 +1017,8 @@ acpi_bus_driver_init(struct acpi_device *device, struct acpi_driver *driver)
return -ENOSYS; return -ENOSYS;
result = driver->ops.add(device); result = driver->ops.add(device);
if (result) { if (result)
device->driver = NULL;
device->driver_data = NULL;
return result; return result;
}
device->driver = driver; device->driver = driver;

3
drivers/acpi/video.c
View File

@ -1722,6 +1722,9 @@ static int acpi_video_bus_add(struct acpi_device *device)
int error; int error;
acpi_status status; acpi_status status;
if (device->handler)
return -EINVAL;
status = acpi_walk_namespace(ACPI_TYPE_DEVICE, status = acpi_walk_namespace(ACPI_TYPE_DEVICE,
device->parent->handle, 1, device->parent->handle, 1,
acpi_video_bus_match, NULL, acpi_video_bus_match, NULL,