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

Commit f42712a9 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

driver core: property: Update fwnode_property_read_string_array() 



Commit 5c0acf3b (driver core: Add comments about returning array
counts) forgot to update fwnode_property_read_string_array() along
the lines of device_property_read_string_array(), although it did
change the kerneldoc comment of it.  Fix that.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5c0acf3b

drivers/base/property.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -347,8 +347,10 @@ int fwnode_property_read_string_array(struct fwnode_handle *fwnode, 
				      size_t nval)

				      size_t nval)

{

{

	if (is_of_node(fwnode))

	if (is_of_node(fwnode))

		return of_property_read_string_array(of_node(fwnode), propname,

		return val ?

						     val, nval);

			of_property_read_string_array(of_node(fwnode), propname,

						      val, nval) :

			of_property_count_strings(of_node(fwnode), propname);

	else if (is_acpi_node(fwnode))

	else if (is_acpi_node(fwnode))

		return acpi_dev_prop_read(acpi_node(fwnode), propname,

		return acpi_dev_prop_read(acpi_node(fwnode), propname,

					  DEV_PROP_STRING, val, nval);

					  DEV_PROP_STRING, val, nval);