Merge branch 'topic/snd_card_new-err' into topic/cs423x-merge

1 files changed, 4 insertions, 3 deletions

diff --git a/sound/isa/ad1816a/ad1816a.c b/sound/isa/ad1816a/ad1816a.c
index 15f60107a11..bbcbf92a8eb 100644
--- a/sound/isa/ad1816a/ad1816a.c
+++ b/sound/isa/ad1816a/ad1816a.c
@@ -158,9 +158,10 @@ static int __devinit snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard
         struct snd_opl3 *opl3;
         struct snd_timer *timer;
 
-        if ((card = snd_card_new(index[dev], id[dev], THIS_MODULE,
-                                 sizeof(struct snd_card_ad1816a))) == NULL)
-                return -ENOMEM;
+        error = snd_card_create(index[dev], id[dev], THIS_MODULE,
+                                sizeof(struct snd_card_ad1816a), &card);
+        if (error < 0)
+                return error;
         acard = (struct snd_card_ad1816a *)card->private_data;
 
         if ((error = snd_card_ad1816a_pnp(dev, acard, pcard, pid))) {