Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[cascardo/linux.git] / drivers / base / property.c

diff --git a/drivers/base/property.c b/drivers/base/property.c
index a5efb43..ff03f23 100644 (file)
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@ -29,9 +29,10 @@
  */
 void device_add_property_set(struct device *dev, struct property_set *pset)
 {
-       if (pset)
-               pset->fwnode.type = FWNODE_PDATA;
+       if (!pset)
+               return;
 
+       pset->fwnode.type = FWNODE_PDATA;
        set_secondary_fwnode(dev, &pset->fwnode);
 }
 EXPORT_SYMBOL_GPL(device_add_property_set);
@@ -472,7 +473,8 @@ int fwnode_property_read_string(struct fwnode_handle *fwnode,
                return acpi_dev_prop_read(to_acpi_node(fwnode), propname,
                                          DEV_PROP_STRING, val, 1);
 
-       return -ENXIO;
+       return pset_prop_read_array(to_pset(fwnode), propname,
+                                   DEV_PROP_STRING, val, 1);
 }
 EXPORT_SYMBOL_GPL(fwnode_property_read_string);