diff options
| author | Wei Yongjun | 2014-07-20 05:43:07 +0200 |
|---|---|---|
| committer | Mark Brown | 2014-07-29 20:55:53 +0200 |
| commit | 71864b22f50ceab0025ae2a1cd81b956878ded2b (patch) | |
| tree | 753e6eb7b56bd311a29bbcf302fe14556717f243 /sound/soc | |
| parent | ASoC: samsung: remove unused DMA data (diff) | |
| download | kernel-qcow2-linux-71864b22f50ceab0025ae2a1cd81b956878ded2b.tar.gz kernel-qcow2-linux-71864b22f50ceab0025ae2a1cd81b956878ded2b.tar.xz kernel-qcow2-linux-71864b22f50ceab0025ae2a1cd81b956878ded2b.zip | |
ASoC: samsung: Fix return value check in s3c2412_iis_dev_probe()
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>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/samsung/s3c2412-i2s.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sound/soc/samsung/s3c2412-i2s.c b/sound/soc/samsung/s3c2412-i2s.c index 9180310e862a..27b339c6580e 100644 --- a/sound/soc/samsung/s3c2412-i2s.c +++ b/sound/soc/samsung/s3c2412-i2s.c @@ -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; |