lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 497/879] ASoC: codecs: lpass: Fix passing zero to PTR_ERR
    Date
    From: YueHaibing <yuehaibing@huawei.com>

    [ Upstream commit 81e7b165c45e94188ae8f1134b57f27d1f35452f ]

    sound/soc/codecs/lpass-macro-common.c:28 lpass_macro_pds_init() warn: passing zero to 'PTR_ERR'
    sound/soc/codecs/lpass-macro-common.c:38 lpass_macro_pds_init() warn: passing zero to 'PTR_ERR'
    sound/soc/codecs/lpass-macro-common.c:54 lpass_macro_pds_init() warn: passing zero to 'ERR_PTR'

    dev_pm_domain_attach_by_name() may return NULL, set 'ret' as
    -ENODATA to fix this warning.

    Fixes: 1a8ee4cf8418 ("ASoC: codecs: Fix error handling in power domain init and exit handlers")
    Signed-off-by: YueHaibing <yuehaibing@huawei.com>
    Link: https://lore.kernel.org/r/20220516120909.36356-1-yuehaibing@huawei.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/codecs/lpass-macro-common.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/sound/soc/codecs/lpass-macro-common.c b/sound/soc/codecs/lpass-macro-common.c
    index 3c661fd61173..1b9082d237c1 100644
    --- a/sound/soc/codecs/lpass-macro-common.c
    +++ b/sound/soc/codecs/lpass-macro-common.c
    @@ -25,7 +25,7 @@ struct lpass_macro *lpass_macro_pds_init(struct device *dev)

    l_pds->macro_pd = dev_pm_domain_attach_by_name(dev, "macro");
    if (IS_ERR_OR_NULL(l_pds->macro_pd)) {
    - ret = PTR_ERR(l_pds->macro_pd);
    + ret = l_pds->macro_pd ? PTR_ERR(l_pds->macro_pd) : -ENODATA;
    goto macro_err;
    }

    @@ -35,7 +35,7 @@ struct lpass_macro *lpass_macro_pds_init(struct device *dev)

    l_pds->dcodec_pd = dev_pm_domain_attach_by_name(dev, "dcodec");
    if (IS_ERR_OR_NULL(l_pds->dcodec_pd)) {
    - ret = PTR_ERR(l_pds->dcodec_pd);
    + ret = l_pds->dcodec_pd ? PTR_ERR(l_pds->dcodec_pd) : -ENODATA;
    goto dcodec_err;
    }

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-08 03:41    [W:4.163 / U:0.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site