Merge branch 'topic/snd_card_new-err' into topic/asoc

Conflicts:
	sound/soc/soc-core.c

1 files changed, 4 insertions, 4 deletions

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index f18c7a3e36d..580a1a534ad 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1308,17 +1308,17 @@ int snd_soc_new_pcms(struct snd_soc_device *socdev, int idx, const char *xid)
 {
 	struct snd_soc_card *card = socdev->card;
 	struct snd_soc_codec *codec = card->codec;
-	int ret = 0, i;
+	int ret, i;
 
 	mutex_lock(&codec->mutex);
 
 	/* register a sound card */
-	codec->card = snd_card_new(idx, xid, codec->owner, 0);
-	if (!codec->card) {
+	ret = snd_card_create(idx, xid, codec->owner, 0, &codec->card);
+	if (ret < 0) {
 		printk(KERN_ERR "asoc: can't create sound card for codec %s\n",
 			codec->name);
 		mutex_unlock(&codec->mutex);
-		return -ENODEV;
+		return ret;
 	}
 
 	codec->card->dev = socdev->dev;