diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-04-17 01:19:50 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-04-19 22:56:44 +0200 |
| commit | f5beabfe61794d9a9d9549d387cda2bffd81e504 (patch) | |
| tree | fbe8c927609f4a3913e21558631ab5f79e9ba3d7 | |
| parent | 27d6b97786ffd42be235553156c9bd4f075922aa (diff) | |
| download | linux-f5beabfe61794d9a9d9549d387cda2bffd81e504.tar.gz | |
ACPI / scan: Apply default enumeration to devices with ACPI drivers
The current code in acpi_bus_attach() is inconsistent with respect to device objects with ACPI drivers bound to them, as it allows ACPI drivers to bind to device objects with existing "physical" device companions, but it doesn't allow "physical" device objects to be created for ACPI device objects with ACPI drivers bound to them. Thus, in some cases, the outcome depends on the ordering of events which is confusing at best. For this reason, modify acpi_bus_attach() to call acpi_default_enumeration() for device objects with the pnp.type.platform_id flag set regardless of whether or not any ACPI drivers are bound to them. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> Reviewed-by: Joey Lee <jlee@suse.com>
| -rw-r--r-- | drivers/acpi/scan.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index acfa6c0831f2..f74bc0d28692 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1856,10 +1856,10 @@ static void acpi_bus_attach(struct acpi_device *device) if (ret < 0) return; - if (ret > 0 || !device->pnp.type.platform_id) - acpi_device_set_enumerated(device); - else + if (device->pnp.type.platform_id) acpi_default_enumeration(device); + else + acpi_device_set_enumerated(device); ok: list_for_each_entry(child, &device->children, node) |