Commit fd8d8e63 authored Dec 17, 2015 by Bartlomiej Zolnierkiewicz Committed by Rafael J. Wysocki Dec 28, 2015

PM / OPP: Fix parsing of opp-microvolt and opp-microamp properties



Commit 01fb4d3c ("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.

Fixes: 01fb4d3c ("PM / OPP: Parse 'opp-<prop>-<name> 'bindings")
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent 01fb4d3c

drivers/base/power/opp/core.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -814,7 +814,7 @@ static int opp_parse_supplies(struct dev_pm_opp opp, struct device 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_pm_opp opp, struct device dev,

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