evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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.

Fixes: 01fb4d3c39d3 ("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>
(cherry picked from commit fd8d8e63467c922be9ae4452cca2980d473477d9)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2015-12-17 19:04:38 +01:00 • committed by Alex Shi
parent 6a0f8e913d
commit ff7d038f3c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/base/power/opp/core.c
View file

@ -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);
}