Commit 985c788b authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'pm-5.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull power management fixes from Rafael Wysocki:
 "These fix a few issues in the operating performance points (OPP)
  framework.

  Specifics:

   - Fix re-enabling of resources in dev_pm_opp_set_rate() (Rajendra
     Nayak)

   - Fix OPP table reference counting in error paths (Stephen Boyd)"

* tag 'pm-5.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  opp: Enable resources again if they were disabled earlier
  opp: Put opp table in dev_pm_opp_set_rate() if _set_opp_bw() fails
  opp: Put opp table in dev_pm_opp_set_rate() for empty tables
parents d723b99e cc15fd98
...@@ -893,8 +893,10 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq) ...@@ -893,8 +893,10 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
* have OPP table for the device, while others don't and * have OPP table for the device, while others don't and
* opp_set_rate() just needs to behave like clk_set_rate(). * opp_set_rate() just needs to behave like clk_set_rate().
*/ */
if (!_get_opp_count(opp_table)) if (!_get_opp_count(opp_table)) {
return 0; ret = 0;
goto put_opp_table;
}
if (!opp_table->required_opp_tables && !opp_table->regulators && if (!opp_table->required_opp_tables && !opp_table->regulators &&
!opp_table->paths) { !opp_table->paths) {
...@@ -905,7 +907,7 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq) ...@@ -905,7 +907,7 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
ret = _set_opp_bw(opp_table, NULL, dev, true); ret = _set_opp_bw(opp_table, NULL, dev, true);
if (ret) if (ret)
return ret; goto put_opp_table;
if (opp_table->regulator_enabled) { if (opp_table->regulator_enabled) {
regulator_disable(opp_table->regulators[0]); regulator_disable(opp_table->regulators[0]);
...@@ -932,10 +934,13 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq) ...@@ -932,10 +934,13 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
/* Return early if nothing to do */ /* Return early if nothing to do */
if (old_freq == freq) { if (old_freq == freq) {
dev_dbg(dev, "%s: old/new frequencies (%lu Hz) are same, nothing to do\n", if (!opp_table->required_opp_tables && !opp_table->regulators &&
__func__, freq); !opp_table->paths) {
ret = 0; dev_dbg(dev, "%s: old/new frequencies (%lu Hz) are same, nothing to do\n",
goto put_opp_table; __func__, freq);
ret = 0;
goto put_opp_table;
}
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment