Changeset 410 for GPL/branches/uniaud32-2.0/alsa-kernel/isa/wavefront/wavefront.c

Timestamp:

Jan 25, 2009, 11:51:57 PM (16 years ago)

Author:

Paul Smedley

Message:

Update ALSA core to 1.0.19 level

File:

• GPL/branches/uniaud32-2.0/alsa-kernel/isa/wavefront/wavefront.c (modified) (4 diffs)

GPL/branches/uniaud32-2.0/alsa-kernel/isa/wavefront/wavefront.c ¶

@@ -339 +339 @@
 }
 
-static struct snd_card *snd_wavefront_card_new(int dev)
+static int snd_wavefront_card_new(int dev, struct snd_card **cardp)
 {
         struct snd_card *card;
         snd_wavefront_card_t *acard;
-
-        card = snd_card_new (index[dev], id[dev], THIS_MODULE,
-                             sizeof(snd_wavefront_card_t));
-        if (card == NULL)
-                return NULL;
+        int err;
+
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
+                              sizeof(snd_wavefront_card_t), &card);
+        if (err < 0)
+                return err;
 
         acard = card->private_data;
@@ -358 +359 @@
         card->private_free = snd_wavefront_free;
 
-        return card;
+        *cardp = card;
+        return 0;
 }
 
@@ -568 +570 @@
         int err;
 
-        card = snd_wavefront_card_new(dev);
-        if (! card)
-                return -ENOMEM;
+        err = snd_wavefront_card_new(dev, &card);
+        if (err < 0)
+                return err;
         snd_card_set_dev(card, pdev);
         if ((err = snd_wavefront_probe(card, dev)) < 0) {
@@ -617 +619 @@
                 return -ENODEV;
 
-        card = snd_wavefront_card_new(dev);
-        if (! card)
-                return -ENOMEM;
+        res = snd_wavefront_card_new(dev, &card);
+        if (res < 0)
+                return res;
 
         if (snd_wavefront_pnp (dev, card->private_data, pcard, pid) < 0) {