OSDN Git Service

ASoC: codecs: lpass: Fix passing zero to 'PTR_ERR'
authorYueHaibing <yuehaibing@huawei.com>
Mon, 16 May 2022 12:09:09 +0000 (20:09 +0800)
committerMark Brown <broonie@kernel.org>
Thu, 19 May 2022 15:44:30 +0000 (16:44 +0100)
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>
sound/soc/codecs/lpass-macro-common.c

index 3c661fd..1b9082d 100644 (file)
@@ -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;
        }