From b0608869e60b3418ebfe19ba4581a817df3986f5 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Sat, 8 Jun 2013 02:55:07 +0200 Subject: [PATCH] --- yaml --- r: 376802 b: refs/heads/master c: ea7f665612fcc73da6b7698f468cd5fc03a30d47 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/scan.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0059bb3b9aff..0df9f69d5f26 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e8193ce572f0ddb8004acf976bba119f0abbe6ca +refs/heads/master: ea7f665612fcc73da6b7698f468cd5fc03a30d47 diff --git a/trunk/drivers/acpi/scan.c b/trunk/drivers/acpi/scan.c index 90c5759e1355..44225cb15f3a 100644 --- a/trunk/drivers/acpi/scan.c +++ b/trunk/drivers/acpi/scan.c @@ -740,10 +740,6 @@ 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); }