summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2013-10-25 17:06:24 +0800
committerMark Brown <broonie@linaro.org>2013-10-25 10:25:51 +0100
commit29ca9c73e54131c9ad90c5381f368d9b09b5aca4 (patch)
tree4e6603438a6cb37fbf5edec3e53714ece60c3c26 /sound
parentde0022d4bf3a5acaef75cf1c7c2f8d71b020e8c9 (diff)
downloadop-kernel-dev-29ca9c73e54131c9ad90c5381f368d9b09b5aca4.zip
op-kernel-dev-29ca9c73e54131c9ad90c5381f368d9b09b5aca4.tar.gz
ASoC: samsung: fix return value check in i2s_alloc_dai()
In case of error, the function platform_device_alloc() returns NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check should be replaced with NULL test. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/samsung/i2s.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index 32956df..2e031fa 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -1073,7 +1073,7 @@ static struct i2s_dai *i2s_alloc_dai(struct platform_device *pdev, bool sec)
dev_set_drvdata(&i2s->pdev->dev, i2s);
} else { /* Create a new platform_device for Secondary */
i2s->pdev = platform_device_alloc("samsung-i2s-sec", -1);
- if (IS_ERR(i2s->pdev))
+ if (!i2s->pdev)
return NULL;
i2s->pdev->dev.parent = &pdev->dev;
OpenPOWER on IntegriCloud