summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@linaro.org>2020-10-14 09:56:28 +0530
committerViresh Kumar <viresh.kumar@linaro.org>2020-10-27 10:38:28 +0530
commit1f6620f87006dc02c608466cd990778aaadf386a (patch)
treecd2dd466f5098fe27695417e3572a0893b2bf6c4
parent3650b228f83adda7e5ee532e2b90429c03f7b9ec (diff)
downloadlinux-1f6620f87006dc02c608466cd990778aaadf386a.tar.bz2
opp: Don't always remove static OPPs in _of_add_opp_table_v1()
The patch missed returning 0 early in case of success and hence the static OPPs got removed by mistake. Fix it. Fixes: 90d46d71cce2 ("opp: Handle multiple calls for same OPP table in _of_add_opp_table_v1()") Reported-by: Aisheng Dong <aisheng.dong@nxp.com> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Tested-by: Dong Aisheng <aisheng.dong@nxp.com>
-rw-r--r--drivers/opp/of.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/opp/of.c b/drivers/opp/of.c
index 874b58756220..9faeb83e4b32 100644
--- a/drivers/opp/of.c
+++ b/drivers/opp/of.c
@@ -944,6 +944,8 @@ static int _of_add_opp_table_v1(struct device *dev, struct opp_table *opp_table)
nr -= 2;
}
+ return 0;
+
remove_static_opp:
_opp_remove_all_static(opp_table);