Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51858a27 authored by Sakari Ailus's avatar Sakari Ailus Committed by Rafael J. Wysocki
Browse files

ACPI: properties: Fix __acpi_node_get_property_reference() return codes 



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: default avatarHyungwoo Yang <hyungwoo.yang@intel.com>
Fixes: 3e3119d3 (device property: Introduce fwnode_property_get_reference_args)
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Tested-by: default avatarHyungwoo Yang <hyungwoo.yang@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent c343bc2c

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;