diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-18 08:18:47 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-18 19:04:25 -0500 |
commit | 883461679ad1ed6e09135adf8c02bb98d7962623 (patch) | |
tree | 25c42afc4b78c6cb6d1914d7d2afeb4501378b20 /drivers/acpi | |
parent | f516bde5122422889398d10e8e746d18860bd42e (diff) |
ACPI / scan: Set flags.match_driver in acpi_bus_scan_fixed()
Before commit 6931007cc90b (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: 6931007cc90b (ACPI / scan: Start matching drivers after trying scan handlers)
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/scan.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 821d154221d5..ce518867a18a 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
@@ -1990,6 +1990,7 @@ static int acpi_bus_scan_fixed(void) | |||
1990 | if (result) | 1990 | if (result) |
1991 | return result; | 1991 | return result; |
1992 | 1992 | ||
1993 | device->flags.match_driver = true; | ||
1993 | result = device_attach(&device->dev); | 1994 | result = device_attach(&device->dev); |
1994 | if (result < 0) | 1995 | if (result < 0) |
1995 | return result; | 1996 | return result; |
@@ -2006,6 +2007,7 @@ static int acpi_bus_scan_fixed(void) | |||
2006 | if (result) | 2007 | if (result) |
2007 | return result; | 2008 | return result; |
2008 | 2009 | ||
2010 | device->flags.match_driver = true; | ||
2009 | result = device_attach(&device->dev); | 2011 | result = device_attach(&device->dev); |
2010 | } | 2012 | } |
2011 | 2013 | ||