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

1 files changed, 4 insertions, 3 deletions

diff --git a/sound/aoa/core/alsa.c b/sound/aoa/core/alsa.c
index 617850463582..0fa3855b4790 100644
--- a/sound/aoa/core/alsa.c
+++ b/sound/aoa/core/alsa.c
@@ -23,9 +23,10 @@ int aoa_alsa_init(char *name, struct module *mod, struct device *dev)
                 /* cannot be EEXIST due to usage in aoa_fabric_register */
                 return -EBUSY;
 
-        alsa_card = snd_card_new(index, name, mod, sizeof(struct aoa_card));
-        if (!alsa_card)
-                return -ENOMEM;
+        err = snd_card_create(index, name, mod, sizeof(struct aoa_card),
+                              &alsa_card);
+        if (err < 0)
+                return err;
         aoa_card = alsa_card->private_data;
         aoa_card->alsa_card = alsa_card;
         alsa_card->dev = dev;