1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 44225cb15f3a..90c5759e1355 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -740,6 +740,10 @@ static int acpi_bus_match(struct device *dev, struct device_driver *drv)
         struct acpi_device *acpi_dev = to_acpi_device(dev);
         struct acpi_driver *acpi_drv = to_acpi_driver(drv);
 
+        /* Skip ACPI device objects with scan handlers attached. */
+        if (acpi_dev->handler)
+                return 0;
+
         return acpi_dev->flags.match_driver
                 && !acpi_match_device_ids(acpi_dev, acpi_drv->ids);
 }