[PATCH 5.10 476/575] opp: Fix return in _opp_add_static_v2()

From: Greg Kroah-Hartman
Date: Mon Nov 15 2021 - 15:50:42 EST


From: YueHaibing <yuehaibing@xxxxxxxxxx>

[ 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: deac8703da5f ("PM / OPP: _of_add_opp_table_v2(): increment count only if OPP is added")
Signed-off-by: YueHaibing <yuehaibing@xxxxxxxxxx>
Signed-off-by: Viresh Kumar <viresh.kumar@xxxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
---
drivers/opp/of.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/opp/of.c b/drivers/opp/of.c
index f83f4f6d70349..5de46aa99d243 100644
--- a/drivers/opp/of.c
+++ b/drivers/opp/of.c
@@ -827,7 +827,7 @@ free_required_opps:
free_opp:
_opp_free(new_opp);

- return ERR_PTR(ret);
+ return ret ? ERR_PTR(ret) : NULL;
}

/* Initializes OPP tables based on new bindings */
--
2.33.0