Commit 5a893e0e authored Oct 08, 2021 by YueHaibing Committed by Greg Kroah-Hartman Nov 17, 2021

opp: Fix return in _opp_add_static_v2()



[ Upstream commit 27ff8187f13ecfec8a26fb1928e906f46f326cc5 ]

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: deac8703 ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 98ac6982

drivers/opp/of.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -639,7 +639,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 */