aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-11-03 22:04:20 -0800
committerMark Brown <broonie@linaro.org>2013-11-03 22:04:20 -0800
commitd09223279370bf97a15d0bfd875632da19bd5ef3 (patch)
treea6c5cf46f724cd5dd20ec11dd6f23b8237a8b1b3
parent4cf9159e2ae7d3a91f63b94c6dc7cb8ce3bfd257 (diff)
parent29ca9c73e54131c9ad90c5381f368d9b09b5aca4 (diff)
Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next
-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 2c4d2505a19e..a5cbdb4f1655 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -1068,7 +1068,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;

Privacy Policy