Commit 01fb4d3c39d3 ("PM / OPP: Parse 'opp-<prop>-<name>' bindings") broke support for parsing standard opp-microvolt and opp-microamp properties. Fix it by setting 'name' string to proper value for !prop cases.

Cc: Viresh Kumar viresh.kumar@linaro.org Cc: Lee Jones lee.jones@linaro.org Cc: Rafael J. Wysocki rafael.j.wysocki@intel.com Fixes: 01fb4d3c39d3 ("PM / OPP: Parse 'opp-<prop>-<name> 'bindings") Signed-off-by: Bartlomiej Zolnierkiewicz b.zolnierkie@samsung.com --- v2: - rework the changes as requested by Viresh

This fixes Exynos4x12 cpufreq-dt suppport regression present in linux-pm/linux-next tree. Rafael, please apply. Thank you.

drivers/base/power/opp/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

Index: b/drivers/base/power/opp/core.c =================================================================== --- a/drivers/base/power/opp/core.c 2015-12-17 18:57:27.358981831 +0100 +++ b/drivers/base/power/opp/core.c 2015-12-17 18:58:04.550982529 +0100 @@ -814,7 +814,7 @@ static int opp_parse_supplies(struct dev

if (!prop) { /* Search for "opp-microvolt" */ - name[13] = '\0'; + sprintf(name, "opp-microvolt"); prop = of_find_property(opp->np, name, NULL);

/* Missing property isn't a problem, but an invalid entry is */ @@ -855,7 +855,7 @@ static int opp_parse_supplies(struct dev

if (!prop) { /* Search for "opp-microamp" */ - name[12] = '\0'; + sprintf(name, "opp-microamp"); prop = of_find_property(opp->np, name, NULL); }