ACPI: property: Adjust failure handling in acpi_nondev_subnode_extract()

Make acpi_nondev_subnode_extract() follow the usual code flow pattern
in which failure is handled at the point where it is detected.

No intentional functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Tested-by: Sakari Ailus <sakari.ailus@linux.intel.com>

diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c
index c086786fe84cb457d45b89144020b5f113cd05fe..54baa23a9e5ae3a4fa4e3b10aa68c0189f6ed6d7 100644 (file)
--- a/drivers/acpi/property.c
+++ b/drivers/acpi/property.c
@@ -123,20 +123,21 @@ static bool acpi_nondev_subnode_extract(union acpi_object *desc,
        if (acpi_enumerate_nondev_subnodes(scope, desc, &dn->data, &dn->fwnode))
                result = true;
 
-       if (result) {
-               /*
-                * This will be NULL if the desc package is embedded in an outer
-                * _DSD-equivalent package and its scope cannot be determined.
-                */
-               dn->handle = handle;
-               dn->data.pointer = desc;
-               list_add_tail(&dn->sibling, list);
-               return true;
+       if (!result) {
+               kfree(dn);
+               acpi_handle_debug(handle, "Invalid properties/subnodes data, skipping\n");
+               return false;
        }
 
-       kfree(dn);
-       acpi_handle_debug(handle, "Invalid properties/subnodes data, skipping\n");
-       return false;
+       /*
+        * This will be NULL if the desc package is embedded in an outer
+        * _DSD-equivalent package and its scope cannot be determined.
+        */
+       dn->handle = handle;
+       dn->data.pointer = desc;
+       list_add_tail(&dn->sibling, list);
+
+       return true;
 }
 
 static bool acpi_nondev_subnode_ok(acpi_handle scope,