1 files changed, 9 insertions, 4 deletions

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 10985573aaa7..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);
@@ -1981,6 +1983,9 @@ static acpi_status acpi_bus_device_attach(acpi_handle handle, u32 lvl_not_used,
         if (acpi_bus_get_device(handle, &device))
                 return AE_CTRL_DEPTH;
 
+        if (device->handler)
+                return AE_OK;
+
         ret = acpi_scan_attach_handler(device);
         if (ret)
                 return ret > 0 ? AE_OK : AE_CTRL_DEPTH;