ACPI: scan: Fix battery devices sometimes never binding

[sfrench/cifs-2.6.git] / drivers / acpi / scan.c

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 1db063b02f63eb8d61076b44cfc00fe40b8a5b65..22566b4b3150ada418ed25f377c7b585d58ce50b 100644 (file)
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -2123,12 +2123,12 @@ void acpi_walk_dep_device_list(acpi_handle handle)
        list_for_each_entry_safe(dep, tmp, &acpi_dep_list, node) {
                if (dep->supplier == handle) {
                        acpi_bus_get_device(dep->consumer, &adev);
-                       if (!adev)
-                               continue;
 
-                       adev->dep_unmet--;
-                       if (!adev->dep_unmet)
-                               acpi_bus_attach(adev, true);
+                       if (adev) {
+                               adev->dep_unmet--;
+                               if (!adev->dep_unmet)
+                                       acpi_bus_attach(adev, true);
+                       }
 
                        list_del(&dep->node);
                        kfree(dep);