summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-07-08 02:01:53 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-07-15 01:26:18 +0200
commit8832f7e43fa7f0f19bd54e13766a825dd1ed4d6f (patch)
tree6be1ec5b2fdd6e1f7842d15f610fd9955a574148 /drivers/acpi
parent3a391a39593b48341f0908511590a6c0e55cc069 (diff)
downloadlinux-8832f7e43fa7f0f19bd54e13766a825dd1ed4d6f.tar.bz2
ACPI / scan: Always call acpi_bus_scan() for bus check notifications
An ACPI_NOTIFY_BUS_CHECK notification means that we should scan the entire namespace starting from the given handle even if the device represented by that handle is present (other devices below it may just have appeared). For this reason, modify acpi_scan_bus_device_check() to always run acpi_bus_scan() if the notification being handled is of type ACPI_NOTIFY_BUS_CHECK. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Acked-by: Toshi Kani <toshi.kani@hp.com> Cc: 3.10+ <stable@vger.kernel.org>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/scan.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 080d75962c57..8a46c924effd 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -352,10 +352,12 @@ static void acpi_scan_bus_device_check(acpi_handle handle, u32 ost_source)
mutex_lock(&acpi_scan_lock);
lock_device_hotplug();
- acpi_bus_get_device(handle, &device);
- if (device) {
- dev_warn(&device->dev, "Attempt to re-insert\n");
- goto out;
+ if (ost_source != ACPI_NOTIFY_BUS_CHECK) {
+ acpi_bus_get_device(handle, &device);
+ if (device) {
+ dev_warn(&device->dev, "Attempt to re-insert\n");
+ goto out;
+ }
}
acpi_evaluate_hotplug_ost(handle, ost_source,
ACPI_OST_SC_INSERT_IN_PROGRESS, NULL);