Skip to content

Commit

Permalink
ACPI / scan: Set flags.match_driver in acpi_bus_scan_fixed()
Browse files Browse the repository at this point in the history
Before commit 6931007 (ACPI / scan: Start matching drivers
after trying scan handlers) the match_driver flag for all devices
was set in acpi_add_single_object(), but now it is set by
acpi_bus_device_attach() which is not called for the "fixed"
devices added by acpi_bus_scan_fixed().  This means that
flags.match_driver is never set for those devices now, so make
acpi_bus_scan_fixed() set it before calling device_attach().

Fixes: 6931007 (ACPI / scan: Start matching drivers after trying scan handlers)
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Rafael J. Wysocki committed Nov 19, 2013
1 parent f516bde commit 8834616
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions drivers/acpi/scan.c
Original file line number Diff line number Diff line change
Expand Up @@ -1990,6 +1990,7 @@ static int acpi_bus_scan_fixed(void)
if (result)
return result;

device->flags.match_driver = true;
result = device_attach(&device->dev);
if (result < 0)
return result;
Expand All @@ -2006,6 +2007,7 @@ static int acpi_bus_scan_fixed(void)
if (result)
return result;

device->flags.match_driver = true;
result = device_attach(&device->dev);
}

Expand Down

0 comments on commit 8834616

Please sign in to comment.