aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-07-16 16:48:13 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-07-16 16:48:13 +0200
commita6c99daa8c9bbed28a459fd9e6cf62a5fef623d8 (patch)
treeedb06d98ca8dcc38b03a2d9a59fcb3709f531330
parent11ba468877bb23f28956a35e896356252d63c983 (diff)
parent6544abc520f0fff701e9da382110dc29676c683a (diff)
downloadlinux-a6c99daa8c9bbed28a459fd9e6cf62a5fef623d8.tar.gz
Merge branch 'opp/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm
Pull an operating performance points (OPP) framework fix for 5.8-rc6 from Viresh Kumar: "This fixes freeing of the OPP entries for the legacy OPP table type (v1)." * 'opp/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm: opp: Increase parsed_static_opps in _of_add_opp_table_v1()
-rw-r--r--drivers/opp/of.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/opp/of.c b/drivers/opp/of.c
index 9a5873591a40c9..314f306140a1cc 100644
--- a/drivers/opp/of.c
+++ b/drivers/opp/of.c
@@ -902,6 +902,10 @@ static int _of_add_opp_table_v1(struct device *dev, struct opp_table *opp_table)
return -EINVAL;
}
+ mutex_lock(&opp_table->lock);
+ opp_table->parsed_static_opps = 1;
+ mutex_unlock(&opp_table->lock);
+
val = prop->value;
while (nr) {
unsigned long freq = be32_to_cpup(val++) * 1000;