1 files changed, 20 insertions, 10 deletions

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index de73fdf89598..45fbe95ba1f3 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1673,22 +1673,32 @@ static int acpi_bus_type_and_status(acpi_handle handle, int *type,
         return 0;
 }
 
+static bool acpi_scan_handler_matching(struct acpi_scan_handler *handler,
+                                       char *idstr,
+                                       const struct acpi_device_id **matchid)
+{
+        const struct acpi_device_id *devid;
+
+        for (devid = handler->ids; devid->id[0]; devid++)
+                if (!strcmp((char *)devid->id, idstr)) {
+                        if (matchid)
+                                *matchid = devid;
+
+                        return true;
+                }
+
+        return false;
+}
+
 static struct acpi_scan_handler *acpi_scan_match_handler(char *idstr,
                                         const struct acpi_device_id **matchid)
 {
         struct acpi_scan_handler *handler;
 
-        list_for_each_entry(handler, &acpi_scan_handlers_list, list_node) {
-                const struct acpi_device_id *devid;
-
-                for (devid = handler->ids; devid->id[0]; devid++)
-                        if (!strcmp((char *)devid->id, idstr)) {
-                                if (matchid)
-                                        *matchid = devid;
+        list_for_each_entry(handler, &acpi_scan_handlers_list, list_node)
+                if (acpi_scan_handler_matching(handler, idstr, matchid))
+                        return handler;
 
-                                return handler;
-                        }
-        }
         return NULL;
 }