diff options
| author |   Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2014-07-30 08:04:12 +0800 |
|---|---|---|
| committer |   Mark Brown <broonie@linaro.org> | 2014-07-31 21:22:17 +0100 |
| commit | c8448051a5e7fda464486eaf5a4ef0c5b6d96673 (patch) | |
| tree | 1c88d58be8fdee970f45a677a4aa868f7b213e36 /sound/soc | |
| parent | ASoC: sirf-usp: Fixed a bug for playback and capture work at the same time (diff) | |
| download | linux-dev-c8448051a5e7fda464486eaf5a4ef0c5b6d96673.tar.xz linux-dev-c8448051a5e7fda464486eaf5a4ef0c5b6d96673.zip | |
ASoC: sirf-audio-codec: Fix return value check in sirf_audio_codec_driver_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().
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/codecs/sirf-audio-codec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/sirf-audio-codec.c b/sound/soc/codecs/sirf-audio-codec.c index d90cb0fafcb2..06ba4923fd5a 100644 --- a/sound/soc/codecs/sirf-audio-codec.c +++ b/sound/soc/codecs/sirf-audio-codec.c @@ -471,8 +471,8 @@ static int sirf_audio_codec_driver_probe(struct platform_device *pdev) mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); base = devm_ioremap_resource(&pdev->dev, mem_res); - if (base == NULL) - return -ENOMEM; + if (IS_ERR(base)) + return PTR_ERR(base); sirf_audio_codec->regmap = devm_regmap_init_mmio(&pdev->dev, base, &sirf_audio_codec_regmap_config); |