diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 4eeea226245412e5ddfa1c147ea41440bf39ca9a..54529424a0a5f05f2c054691a73f62090537cab8 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -822,6 +822,9 @@ static int acpi_device_probe(struct device *dev)
 	struct acpi_driver *acpi_drv = to_acpi_driver(dev->driver);
 	int ret;
 
+	if (acpi_dev->handler)
+		return -EINVAL;
+
 	if (!acpi_drv->ops.add)
 		return -ENOSYS;
 
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 440eadf2d32cdd270a75e9023f9ef31a1d9ae794..5d7075d25700b3bbd2cbe65772391155d1a10d30 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -1722,9 +1722,6 @@ static int acpi_video_bus_add(struct acpi_device *device)
 	int error;
 	acpi_status status;
 
-	if (device->handler)
-		return -EINVAL;
-
 	status = acpi_walk_namespace(ACPI_TYPE_DEVICE,
 				device->parent->handle, 1,
 				acpi_video_bus_match, NULL,