]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
acpi: property: Let args be NULL in __acpi_node_get_property_reference
authorSakari Ailus <sakari.ailus@linux.intel.com>
Thu, 9 Nov 2023 10:10:08 +0000 (12:10 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 1 Mar 2024 12:21:52 +0000 (13:21 +0100)
[ 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: 977d5ad39f3e ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/acpi/property.c

index 488915328646e03d2a1584e987ca5e8919916b13..9ab7f7184343ae35af07054db5e7e3ceecdac1bb 100644 (file)
@@ -639,6 +639,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
@@ -697,6 +698,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;