summaryrefslogtreecommitdiffstats
path: root/drivers/opp
diff options
context:
space:
mode:
authorYueHaibing <yuehaibing@huawei.com>2021-10-08 15:46:52 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-11-18 14:04:22 +0100
commit14943891857da24abe5bba4fa132986eb7842713 (patch)
treef744600149b083cdaa86bbe67b0bb70565b225a3 /drivers/opp
parentbea3213f191a36e34e652c0d964fc3977886a408 (diff)
downloadlinux-stable-14943891857da24abe5bba4fa132986eb7842713.tar.gz
linux-stable-14943891857da24abe5bba4fa132986eb7842713.tar.bz2
linux-stable-14943891857da24abe5bba4fa132986eb7842713.zip
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: deac8703da5f ("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>
Diffstat (limited to 'drivers/opp')
-rw-r--r--drivers/opp/of.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/opp/of.c b/drivers/opp/of.c
index f83f4f6d7034..5de46aa99d24 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 */