Commit 29058753 authored Nov 23, 2012 by Adrian Hunter Committed by Rafael J. Wysocki Nov 23, 2012

ACPI / PNP: skip ACPI device nodes associated with physical nodes already



Make pnpacpi_add_device() ignore ACPI device nodes already associated
with struct device objects representing physical devices.

In particular, this will prevent PNP device objects from being
created for ACPI device nodes already associated with platform
devices.

This change was originally proposed by Mika Westerberg.

[rjw: Modified the subject and changelog.]
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent 907ddf89

drivers/pnp/pnpacpi/core.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -242,6 +242,10 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
		char *pnpid;
		struct acpi_hardware_id *id;

		/* Skip devices that are already bound */
		if (device->physical_node_count)
		return 0;

		/*
		* If a PnPacpi device is not present , the device
		* driver should not be loaded.

Admin message