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

Commit dbb71ba5 authored by Sakari Ailus's avatar Sakari Ailus Committed by Greg Kroah-Hartman
Browse files

acpi: property: Let args be NULL in __acpi_node_get_property_reference 



[ Upstream commit bef52aa0f3de1b7d8c258c13b16e577361dabf3a ]

fwnode_get_property_reference_args() may not be called with args argument
NULL on ACPI, OF already supports this. Add the missing NULL checks and
document this.

The purpose is to be able to count the references.

Fixes: 977d5ad3 ("ACPI: Convert ACPI reference args to generic fwnode reference args")
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20231109101010.1329587-2-sakari.ailus@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent b502fb43

drivers/acpi/property.c

+4 −0
Original line number Diff line number Diff line
@@ -646,6 +646,7 @@ acpi_fwnode_get_named_child_node(const struct fwnode_handle *fwnode, 
 * @index: Index of the reference to return

 * @num_args: Maximum number of arguments after each reference

 * @args: Location to store the returned reference with optional arguments

 *	  (may be NULL)

 *

 * Find property with @name, verifify that it is a package containing at least

 * one object reference and if so, store the ACPI device object pointer to the
@@ -704,6 +705,9 @@ int __acpi_node_get_property_reference(const struct fwnode_handle *fwnode, 
		if (ret)

			return ret == -ENODEV ? -EINVAL : ret;



		if (!args)

			return 0;



		args->fwnode = acpi_fwnode_handle(device);

		args->nargs = 0;

		return 0;