| Message ID | 20190429122512.59242-1-weiyongjun1@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 7c88b92816dfe5eab224b96577b50ac00b4be68a |
| Headers | show |
| Series | [-next] ASoC: sprd: Fix return value check in sprd_mcdt_probe() | expand |
On Mon, 29 Apr 2019 at 20:15, Wei Yongjun <weiyongjun1@huawei.com> wrote: > > In case of error, the function devm_ioremap_resource() returns ERR_PTR() > and never returns NULL. The NULL test in the return value check should > be replaced with IS_ERR(). > > Fixes: d7bff893e04f ("ASoC: sprd: Add Spreadtrum multi-channel data transfer support") > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Thanks for fixing my mistake. Reviewed-by: Baolin Wang <baolin.wang@linaro.org> > --- > sound/soc/sprd/sprd-mcdt.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/sound/soc/sprd/sprd-mcdt.c b/sound/soc/sprd/sprd-mcdt.c > index 28f5e649733d..e9318d7a4810 100644 > --- a/sound/soc/sprd/sprd-mcdt.c > +++ b/sound/soc/sprd/sprd-mcdt.c > @@ -951,8 +951,8 @@ static int sprd_mcdt_probe(struct platform_device *pdev) > > res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > mcdt->base = devm_ioremap_resource(&pdev->dev, res); > - if (!mcdt->base) > - return -ENOMEM; > + if (IS_ERR(mcdt->base)) > + return PTR_ERR(mcdt->base); > > mcdt->dev = &pdev->dev; > spin_lock_init(&mcdt->lock); > > >
diff --git a/sound/soc/sprd/sprd-mcdt.c b/sound/soc/sprd/sprd-mcdt.c index 28f5e649733d..e9318d7a4810 100644 --- a/sound/soc/sprd/sprd-mcdt.c +++ b/sound/soc/sprd/sprd-mcdt.c @@ -951,8 +951,8 @@ static int sprd_mcdt_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); mcdt->base = devm_ioremap_resource(&pdev->dev, res); - if (!mcdt->base) - return -ENOMEM; + if (IS_ERR(mcdt->base)) + return PTR_ERR(mcdt->base); mcdt->dev = &pdev->dev; spin_lock_init(&mcdt->lock);
In case of error, the function devm_ioremap_resource() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Fixes: d7bff893e04f ("ASoC: sprd: Add Spreadtrum multi-channel data transfer support") Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> --- sound/soc/sprd/sprd-mcdt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)