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

Conflicts:
	sound/soc/soc-core.c

5 files changed, 19 insertions, 17 deletions

diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c
index 66c755c116dc..ce98d955231a 100644
--- a/drivers/media/video/cx88/cx88-alsa.c
+++ b/drivers/media/video/cx88/cx88-alsa.c
@@ -803,9 +803,10 @@ static int __devinit cx88_audio_initdev(struct pci_dev *pci,
                 return (-ENOENT);
         }
 
-        card = snd_card_new(index[devno], id[devno], THIS_MODULE, sizeof(snd_cx88_card_t));
-        if (!card)
-                return (-ENOMEM);
+        err = snd_card_create(index[devno], id[devno], THIS_MODULE,
+                              sizeof(snd_cx88_card_t), &card);
+        if (err < 0)
+                return err;
 
         card->private_free = snd_cx88_dev_free;
 
diff --git a/drivers/media/video/em28xx/em28xx-audio.c b/drivers/media/video/em28xx/em28xx-audio.c
index 94378ccb7505..66579508e175 100644
--- a/drivers/media/video/em28xx/em28xx-audio.c
+++ b/drivers/media/video/em28xx/em28xx-audio.c
@@ -438,9 +438,10 @@ static int em28xx_audio_init(struct em28xx *dev)
         printk(KERN_INFO "em28xx-audio.c: Copyright (C) 2006 Markus "
                          "Rechberger\n");
 
-        card = snd_card_new(index[devnr], "Em28xx Audio", THIS_MODULE, 0);
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index[devnr], "Em28xx Audio", THIS_MODULE, 0,
+                              &card);
+        if (err < 0)
+                return err;
 
         spin_lock_init(&adev->slock);
         err = snd_pcm_new(card, "Em28xx Audio", 0, 0, 1, &pcm);
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
index 26194a0ce927..482be1436e92 100644
--- a/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@ -990,10 +990,10 @@ static int alsa_card_saa7134_create(struct saa7134_dev *dev, int devnum)
         if (!enable[devnum])
                 return -ENODEV;
 
-        card = snd_card_new(index[devnum], id[devnum], THIS_MODULE, sizeof(snd_card_saa7134_t));
-
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index[devnum], id[devnum], THIS_MODULE,
+                              sizeof(snd_card_saa7134_t), &card);
+        if (err < 0)
+                return err;
 
         strcpy(card->driver, "SAA7134");
 
diff --git a/drivers/staging/go7007/snd-go7007.c b/drivers/staging/go7007/snd-go7007.c
index a7de401f61ab..cd19be6c00e0 100644
--- a/drivers/staging/go7007/snd-go7007.c
+++ b/drivers/staging/go7007/snd-go7007.c
@@ -248,10 +248,11 @@ int go7007_snd_init(struct go7007 *go)
         spin_lock_init(&gosnd->lock);
         gosnd->hw_ptr = gosnd->w_idx = gosnd->avail = 0;
         gosnd->capturing = 0;
-        gosnd->card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-        if (gosnd->card == NULL) {
+        ret = snd_card_create(index[dev], id[dev], THIS_MODULE, 0,
+                              &gosnd->card);
+        if (ret < 0) {
                 kfree(gosnd);
-                return -ENOMEM;
+                return ret;
         }
         ret = snd_device_new(gosnd->card, SNDRV_DEV_LOWLEVEL, go,
                         &go7007_snd_device_ops);
diff --git a/drivers/usb/gadget/gmidi.c b/drivers/usb/gadget/gmidi.c
index 60d3f9e9b51f..14e09abbddfc 100644
--- a/drivers/usb/gadget/gmidi.c
+++ b/drivers/usb/gadget/gmidi.c
@@ -1099,10 +1099,9 @@ static int gmidi_register_card(struct gmidi_device *dev)
                 .dev_free = gmidi_snd_free,
         };
 
-        card = snd_card_new(index, id, THIS_MODULE, 0);
-        if (!card) {
-                ERROR(dev, "snd_card_new failed\n");
-                err = -ENOMEM;
+        err = snd_card_create(index, id, THIS_MODULE, 0, &card);
+        if (err < 0) {
+                ERROR(dev, "snd_card_create failed\n");
                 goto fail;
         }
         dev->card = card;