summaryrefslogtreecommitdiffstats
path: root/drivers/opp
diff options
context:
space:
mode:
authorStephen Boyd <swboyd@chromium.org>2020-08-11 14:28:36 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-08-26 11:49:00 +0200
commite25d2b38fe64f91e853531dfa4ff07e986a9f9de (patch)
tree16394fac24596092ba432c9e394d675834f4e1c9 /drivers/opp
parent9cb98fa067faa4592833552baf76b33d0cc8412b (diff)
downloadlinux-stable-e25d2b38fe64f91e853531dfa4ff07e986a9f9de.tar.gz
linux-stable-e25d2b38fe64f91e853531dfa4ff07e986a9f9de.tar.bz2
linux-stable-e25d2b38fe64f91e853531dfa4ff07e986a9f9de.zip
opp: Put opp table in dev_pm_opp_set_rate() if _set_opp_bw() fails
commit d4ec88d205583ac4f9482cf3e89128589bd881d2 upstream. We get the opp_table pointer at the top of the function and so we should put the pointer at the end of the function like all other exit paths from this function do. Cc: v5.8+ <stable@vger.kernel.org> # v5.8+ Fixes: b00e667a6d8b ("opp: Remove bandwidth votes when target_freq is zero") Reviewed-by: Rajendra Nayak <rnayak@codeaurora.org> Signed-off-by: Stephen Boyd <swboyd@chromium.org> [ Viresh: Split the patch into two ] Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/opp')
-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 c0e9b5045025..8c90f7871772 100644
--- a/drivers/opp/core.c
+++ b/drivers/opp/core.c
@@ -876,7 +876,7 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
ret = _set_opp_bw(opp_table, NULL, dev, true);
if (ret)
- return ret;
+ goto put_opp_table;
if (opp_table->regulator_enabled) {
regulator_disable(opp_table->regulators[0]);