From: Stephen Boyd <swboyd@chromium.org>
Date: Tue, 11 Aug 2020 21:28:36 +0000 (-0700)
Subject: opp: Put opp table in dev_pm_opp_set_rate() if _set_opp_bw() fails
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d4ec88d205583ac4f9482cf3e89128589bd881d2;p=linux.git

opp: Put opp table in dev_pm_opp_set_rate() if _set_opp_bw() fails

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>
---

diff --git a/drivers/opp/core.c b/drivers/opp/core.c
index f2f32786ee451..bdb028c7793df 100644
--- a/drivers/opp/core.c
+++ b/drivers/opp/core.c
@@ -907,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);
 		if (ret)
-			return ret;
+			goto put_opp_table;
 
 		if (opp_table->regulator_enabled) {
 			regulator_disable(opp_table->regulators[0]);