Skip to content

Commit

Permalink
ASoC: samsung: Fix return value check in s3c2412_iis_dev_probe()
Browse files Browse the repository at this point in the history
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(). Also remove redundant return value check of
platform_get_resource().

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Mark Brown <broonie@linaro.org>
  • Loading branch information
Wei Yongjun authored and Mark Brown committed Jul 29, 2014
1 parent dd2380e commit 71864b2
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions sound/soc/samsung/s3c2412-i2s.c
Original file line number Diff line number Diff line change
Expand Up @@ -154,13 +154,9 @@ static int s3c2412_iis_dev_probe(struct platform_device *pdev)
struct resource *res;

res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) {
dev_err(&pdev->dev, "Can't get IO resource.\n");
return -ENOENT;
}
s3c2412_i2s.regs = devm_ioremap_resource(&pdev->dev, res);
if (s3c2412_i2s.regs == NULL)
return -ENXIO;
if (IS_ERR(s3c2412_i2s.regs))
return PTR_ERR(s3c2412_i2s.regs);

s3c2412_i2s_pcm_stereo_out.dma_addr = res->start + S3C2412_IISTXD;
s3c2412_i2s_pcm_stereo_in.dma_addr = res->start + S3C2412_IISRXD;
Expand Down

0 comments on commit 71864b2

Please sign in to comment.