ACPI: properties: Fix __acpi_node_get_property_reference() return codes (51858a27) · Commits · 戴 / test

Fix more return codes for device property: Align return codes of __acpi_node_get_property_reference(). In particular, what was missed previously: -EPROTO could be returned in certain cases, now -EINVAL; -EINVAL was returned if the property was not found, now -ENOENT; -EINVAL was returned also if the index was higher than the number of entries in a package, now -ENOENT. Reported-by:

Hyungwoo Yang <hyungwoo.yang@intel.com> Fixes: (device property: Introduce fwnode_property_get_reference_args) Signed-off-by:

Sakari Ailus <sakari.ailus@linux.intel.com> Tested-by:

Hyungwoo Yang <hyungwoo.yang@intel.com> Signed-off-by:

Rafael J. Wysocki <rafael.j.wysocki@intel.com>

drivers/acpi/property.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -593,7 +593,7 @@ int __acpi_node_get_property_reference(const struct fwnode_handle *fwnode,

		ret = acpi_data_get_property(data, propname, ACPI_TYPE_ANY, &obj);
		if (ret)
		return ret;
		return ret == -EINVAL ? -ENOENT : -EINVAL;

		/*
		* The simplest case is when the value is a single reference. Just
		@@ -605,7 +605,7 @@ int __acpi_node_get_property_reference(const struct fwnode_handle *fwnode,

		ret = acpi_bus_get_device(obj->reference.handle, &device);
		if (ret)
		return ret;
		return ret == -ENODEV ? -EINVAL : ret;

		args->adev = device;
		args->nargs = 0;
		@@ -621,8 +621,10 @@ int __acpi_node_get_property_reference(const struct fwnode_handle *fwnode,
		* The index argument is then used to determine which reference
		* the caller wants (along with the arguments).
		*/
		if (obj->type != ACPI_TYPE_PACKAGE \|\| index >= obj->package.count)
		return -EPROTO;
		if (obj->type != ACPI_TYPE_PACKAGE)
		return -EINVAL;
		if (index >= obj->package.count)
		return -ENOENT;

		element = obj->package.elements;
		end = element + obj->package.count;

Admin message