Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next

mariux64 · Nov 4, 2013 · d092232 · d092232
2 parents 4cf9159 + 29ca9c7
commit d092232
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;