| From 572b36e7546a029a467014c3676be0673414253f Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 8 Oct 2021 15:46:52 +0800 |
| Subject: opp: Fix return in _opp_add_static_v2() |
| |
| From: YueHaibing <yuehaibing@huawei.com> |
| |
| [ 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> |
| --- |
| 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 30cc407c8f93f..ba30694508153 100644 |
| --- a/drivers/opp/of.c |
| +++ b/drivers/opp/of.c |
| @@ -639,7 +639,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 |
| |
