2021-03-04 09:21:12

by Enric Balletbo i Serra

Subject: [PATCH] soc: mediatek: pm-domains: Fix missing error code in scpsys_add_subdomain()

Adding one power domain in scpsys_add_subdomain is missing to assign an
error code when it fails. Fix that assigning an error code to 'ret',
this also fixes the follwowing smatch warning.

drivers/soc/mediatek/mtk-pm-domains.c:492 scpsys_add_subdomain() warn: missing error code 'ret'

Fixes: dd65030295e2 ("soc: mediatek: pm-domains: Don't print an error if child domain is deferred")
Reported-by: kernel test robot <[email protected]>
Reported-by: Dan Carpenter <[email protected]>
Signed-off-by: Enric Balletbo i Serra <[email protected]>
---

drivers/soc/mediatek/mtk-pm-domains.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/soc/mediatek/mtk-pm-domains.c b/drivers/soc/mediatek/mtk-pm-domains.c
index 694d6ea6de1d..0af00efa0ef8 100644
--- a/drivers/soc/mediatek/mtk-pm-domains.c
+++ b/drivers/soc/mediatek/mtk-pm-domains.c
@@ -491,8 +491,9 @@ static int scpsys_add_subdomain(struct scpsys *scpsys, struct device_node *paren

child_pd = scpsys_add_one_domain(scpsys, child);
if (IS_ERR(child_pd)) {
- dev_err_probe(scpsys->dev, PTR_ERR(child_pd),
- "%pOF: failed to get child domain id\n", child);
+ ret = PTR_ERR(child_pd);
+ dev_err_probe(scpsys->dev, ret, "%pOF: failed to get child domain id\n",
+ child);
goto err_put_node;
}

--
2.30.1

2021-03-30 09:56:51

by Matthias Brugger

Subject: Re: [PATCH] soc: mediatek: pm-domains: Fix missing error code in scpsys_add_subdomain()

On 03/03/2021 10:10, Enric Balletbo i Serra wrote:
> Adding one power domain in scpsys_add_subdomain is missing to assign an
> error code when it fails. Fix that assigning an error code to 'ret',
> this also fixes the follwowing smatch warning.
>
> drivers/soc/mediatek/mtk-pm-domains.c:492 scpsys_add_subdomain() warn: missing error code 'ret'
>
> Fixes: dd65030295e2 ("soc: mediatek: pm-domains: Don't print an error if child domain is deferred")
> Reported-by: kernel test robot <[email protected]>
> Reported-by: Dan Carpenter <[email protected]>
> Signed-off-by: Enric Balletbo i Serra <[email protected]>

Applied to v5.12-next/soc
Thanks!

> ---
>
> drivers/soc/mediatek/mtk-pm-domains.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/soc/mediatek/mtk-pm-domains.c b/drivers/soc/mediatek/mtk-pm-domains.c
> index 694d6ea6de1d..0af00efa0ef8 100644
> --- a/drivers/soc/mediatek/mtk-pm-domains.c
> +++ b/drivers/soc/mediatek/mtk-pm-domains.c
> @@ -491,8 +491,9 @@ static int scpsys_add_subdomain(struct scpsys *scpsys, struct device_node *paren
>
> child_pd = scpsys_add_one_domain(scpsys, child);
> if (IS_ERR(child_pd)) {
> - dev_err_probe(scpsys->dev, PTR_ERR(child_pd),
> - "%pOF: failed to get child domain id\n", child);
> + ret = PTR_ERR(child_pd);
> + dev_err_probe(scpsys->dev, ret, "%pOF: failed to get child domain id\n",
> + child);
> goto err_put_node;
> }
>
>