summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-06-19 18:50:45 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-06-19 18:50:45 +0200
commit3477accaece59199484c4b7586c88235e265f3d0 (patch)
tree1fb8d0fb477c9465093a43949e6affdd0d61e0db
parentce397d215ccd07b8ae3f71db689aedb85d56ab40 (diff)
parentc5c2a97b3ac7d1ec19e7cff9e38caca6afefc3de (diff)
downloadlinux-3477accaece59199484c4b7586c88235e265f3d0.tar.bz2
Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm
Pull an OPP fix for 4.18-rc2 from Viresh Kumar. * 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm: PM / OPP: Update voltage in case freq == old_freq
-rw-r--r--drivers/opp/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/opp/core.c b/drivers/opp/core.c
index ab2f3fead6b1..31ff03dbeb83 100644
--- a/drivers/opp/core.c
+++ b/drivers/opp/core.c
@@ -598,7 +598,7 @@ static int _generic_set_opp_regulator(const struct opp_table *opp_table,
}
/* Scaling up? Scale voltage before frequency */
- if (freq > old_freq) {
+ if (freq >= old_freq) {
ret = _set_opp_voltage(dev, reg, new_supply);
if (ret)
goto restore_voltage;