Merge branch 'pm-opp' into pm-cpufreq
diff --git a/drivers/base/power/opp/core.c b/drivers/base/power/opp/core.c
index 5c01fec..cd230c6 100644
--- a/drivers/base/power/opp/core.c
+++ b/drivers/base/power/opp/core.c
@@ -814,7 +814,7 @@
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 @@
if (!prop) {
/* Search for "opp-microamp" */
- name[12] = '\0';
+ sprintf(name, "opp-microamp");
prop = of_find_property(opp->np, name, NULL);
}
diff --git a/drivers/base/power/opp/cpu.c b/drivers/base/power/opp/cpu.c
index 7b445e8..9f0c155 100644
--- a/drivers/base/power/opp/cpu.c
+++ b/drivers/base/power/opp/cpu.c
@@ -214,7 +214,6 @@
/*
* Works only for OPP v2 bindings.
*
- * cpumask should be already set to mask of cpu_dev->id.
* Returns -ENOENT if operating-points-v2 bindings aren't supported.
*/
int dev_pm_opp_of_get_sharing_cpus(struct device *cpu_dev, cpumask_var_t cpumask)
@@ -230,6 +229,8 @@
return -ENOENT;
}
+ cpumask_set_cpu(cpu_dev->id, cpumask);
+
/* OPPs are shared ? */
if (!of_property_read_bool(np, "opp-shared"))
goto put_cpu_node;