From: Viresh Kumar <viresh.kumar@linaro.org>
Date: Wed, 14 Oct 2020 04:26:28 +0000 (+0530)
Subject: opp: Don't always remove static OPPs in _of_add_opp_table_v1()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1f6620f87006dc02c608466cd990778aaadf386a;p=linux.git

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

diff --git a/drivers/opp/of.c b/drivers/opp/of.c
index 874b587562202..9faeb83e4b326 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);