Merge branch 'topic/snd_card_new-err' into topic/drop-l3

3 files changed, 11 insertions, 10 deletions

diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c
index 89096e811a4b..7d39aac9ec14 100644
--- a/sound/arm/aaci.c
+++ b/sound/arm/aaci.c
@@ -995,10 +995,11 @@ static struct aaci * __devinit aaci_init_card(struct amba_device *dev)
 {
         struct aaci *aaci;
         struct snd_card *card;
+        int err;
 
-        card = snd_card_new(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,
-                            THIS_MODULE, sizeof(struct aaci));
-        if (card == NULL)
+        err = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,
+                              THIS_MODULE, sizeof(struct aaci), &card);
+        if (err < 0)
                 return NULL;
 
         card->private_free = aaci_free_card;
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c
index 85cf591d4e11..7ed100c80a5f 100644
--- a/sound/arm/pxa2xx-ac97.c
+++ b/sound/arm/pxa2xx-ac97.c
@@ -173,10 +173,9 @@ static int __devinit pxa2xx_ac97_probe(struct platform_device *dev)
         struct snd_ac97_template ac97_template;
         int ret;
 
-        ret = -ENOMEM;
-        card = snd_card_new(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,
-                            THIS_MODULE, 0);
-        if (!card)
+        ret = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,
+                              THIS_MODULE, 0, &card);
+        if (ret < 0)
                 goto err;
 
         card->dev = &dev->dev;
diff --git a/sound/arm/sa11xx-uda1341.c b/sound/arm/sa11xx-uda1341.c
index ed481a866a3e..7101d3d8bae6 100644
--- a/sound/arm/sa11xx-uda1341.c
+++ b/sound/arm/sa11xx-uda1341.c
@@ -887,9 +887,10 @@ static int __devinit sa11xx_uda1341_probe(struct platform_device *devptr)
         struct sa11xx_uda1341 *chip;
 
         /* register the soundcard */
-        card = snd_card_new(-1, id, THIS_MODULE, sizeof(struct sa11xx_uda1341));
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(-1, id, THIS_MODULE,
+                              sizeof(struct sa11xx_uda1341), &card);
+        if (err < 0)
+                return err;
 
         chip = card->private_data;
         spin_lock_init(&chip->s[0].dma_lock);