From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Date: Mon, 10 Aug 2015 16:56:47 +0000 (+0300)
Subject: device property: fallback to pset when gettng one string
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4f73b0654d8a954540d49bb0a300f31663423db9;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

device property: fallback to pset when gettng one string

The one string as an equivalent to an array of one element. Allow user to read
one string as a plain string.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

diff --git a/drivers/base/property.c b/drivers/base/property.c
index 37a7bb7b239d..841b15c5c058 100644
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@ -462,7 +462,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);