Commit 0f83b1d4 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Tested-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
parent baf60d5c

drivers/acpi/property.c

+13 −12
Original line number Diff line number Diff line
@@ -123,7 +123,12 @@ 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) {

	if (!result) {

		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.
@@ -131,12 +136,8 @@ static bool acpi_nondev_subnode_extract(union acpi_object *desc, 
	dn->handle = handle;

	dn->data.pointer = desc;

	list_add_tail(&dn->sibling, list);

		return true;

	}



	kfree(dn);

	acpi_handle_debug(handle, "Invalid properties/subnodes data, skipping\n");

	return false;

	return true;

}



static bool acpi_nondev_subnode_ok(acpi_handle scope,