opp: Fix return in _opp_add_static_v2()

YueHaibing · vireshk · commit 27ff8187f13e · 2021-10-08T13:24:46.000+05:30
Fix sparse warning: drivers/opp/of.c:924 _opp_add_static_v2() warn: passing zero to 'ERR_PTR' For duplicate OPPs 'ret' be set to zero. Fixes: deac870 ("PM / OPP: _of_add_opp_table_v2(): increment count only if OPP is added") Signed-off-by: YueHaibing <yuehaibing@huawei.com> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
diff --git a/drivers/opp/of.c b/drivers/opp/of.c
@@ -921,7 +921,7 @@ static struct dev_pm_opp *_opp_add_static_v2(struct opp_table *opp_table,
 free_opp:
 	_opp_free(new_opp);
 
-	return ERR_PTR(ret);
+	return ret ? ERR_PTR(ret) : NULL;
 }
 
 /* Initializes OPP tables based on new bindings */

Original file line number	Diff line number	Diff line change
`@@ -921,7 +921,7 @@ static struct dev_pm_opp _opp_add_static_v2(struct opp_table opp_table,`
`921`	`921`	`free_opp:`
`922`	`922`	`_opp_free(new_opp);`
`923`	`923`
`924`		`- return ERR_PTR(ret);`
	`924`	`+ return ret ? ERR_PTR(ret) : NULL;`
`925`	`925`	`}`
`926`	`926`
`927`	`927`	`/* Initializes OPP tables based on new bindings */`