Skip to content

Commit bef52aa

Browse files
Sakari Ailusgregkh
authored andcommitted
acpi: property: Let args be NULL in __acpi_node_get_property_reference
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: 977d5ad ("ACPI: Convert ACPI reference args to generic fwnode reference args") Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Link: https://lore.kernel.org/r/20231109101010.1329587-2-sakari.ailus@linux.intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 4c09573 commit bef52aa

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

drivers/acpi/property.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -852,6 +852,7 @@ static int acpi_get_ref_args(struct fwnode_reference_args *args,
852852
* @index: Index of the reference to return
853853
* @num_args: Maximum number of arguments after each reference
854854
* @args: Location to store the returned reference with optional arguments
855+
* (may be NULL)
855856
*
856857
* Find property with @name, verifify that it is a package containing at least
857858
* one object reference and if so, store the ACPI device object pointer to the
@@ -908,6 +909,9 @@ int __acpi_node_get_property_reference(const struct fwnode_handle *fwnode,
908909
if (!device)
909910
return -EINVAL;
910911

912+
if (!args)
913+
return 0;
914+
911915
args->fwnode = acpi_fwnode_handle(device);
912916
args->nargs = 0;
913917
return 0;

0 commit comments

Comments
 (0)