aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Boyd <[email protected]>2020-08-11 14:28:36 -0700
committerViresh Kumar <[email protected]>2020-08-17 10:37:10 +0530
commit8979ef70850eb469e1094279259d1ef393ffe85f (patch)
tree1b900bea2855c7fb0288c338bf63b2436f48a0c5
parent9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 (diff)
opp: Put opp table in dev_pm_opp_set_rate() for empty tables
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.7+ <[email protected]> # v5.7+ Fixes: aca48b61f963 ("opp: Manage empty OPP tables with clk handle") Reviewed-by: Rajendra Nayak <[email protected]> Signed-off-by: Stephen Boyd <[email protected]> [ Viresh: Split the patch into two ] Signed-off-by: Viresh Kumar <[email protected]>
-rw-r--r--drivers/opp/core.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/opp/core.c b/drivers/opp/core.c
index 9d7fb45b1786..f2f32786ee45 100644
--- a/drivers/opp/core.c
+++ b/drivers/opp/core.c
@@ -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
* opp_set_rate() just needs to behave like clk_set_rate().
*/
- if (!_get_opp_count(opp_table))
- return 0;
+ if (!_get_opp_count(opp_table)) {
+ ret = 0;
+ goto put_opp_table;
+ }
if (!opp_table->required_opp_tables && !opp_table->regulators &&
!opp_table->paths) {