opp: Don't always remove static OPPs in _of_add_opp_table_v1()

vireshk · vireshk · commit 1f6620f87006 · 2020-10-27T10:38:28.000+05:30
The patch missed returning 0 early in case of success and hence the static OPPs got removed by mistake. Fix it. Fixes: 90d46d7 ("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
@@ -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);
 

Original file line number	Diff line number	Diff line change
`@@ -944,6 +944,8 @@ static int _of_add_opp_table_v1(struct device dev, struct opp_table opp_table)`
`944`	`944`	`nr -= 2;`
`945`	`945`	`}`
`946`	`946`
	`947`	`+ return 0;`
	`948`	`+`
`947`	`949`	`remove_static_opp:`
`948`	`950`	`_opp_remove_all_static(opp_table);`
`949`	`951`