3 files changed, 16 insertions, 13 deletions

diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c
index f87933e48812..574af56ba8a6 100644
--- a/sound/sparc/amd7930.c
+++ b/sound/sparc/amd7930.c
@@ -954,7 +954,8 @@ static int __devinit snd_amd7930_create(struct snd_card *card,
         amd->regs = of_ioremap(&op->resource[0], 0,
                                resource_size(&op->resource[0]), "amd7930");
         if (!amd->regs) {
-                snd_printk("amd7930-%d: Unable to map chip registers.\n", dev);
+                snd_printk(KERN_ERR
+                           "amd7930-%d: Unable to map chip registers.\n", dev);
                 return -EIO;
         }
 
@@ -962,7 +963,7 @@ static int __devinit snd_amd7930_create(struct snd_card *card,
 
         if (request_irq(irq, snd_amd7930_interrupt,
                         IRQF_DISABLED | IRQF_SHARED, "amd7930", amd)) {
-                snd_printk("amd7930-%d: Unable to grab IRQ %d\n",
+                snd_printk(KERN_ERR "amd7930-%d: Unable to grab IRQ %d\n",
                            dev, irq);
                 snd_amd7930_free(amd);
                 return -EBUSY;
@@ -1018,9 +1019,10 @@ static int __devinit amd7930_sbus_probe(struct of_device *op, const struct of_de
                 return -ENOENT;
         }
 
-        card = snd_card_new(index[dev_num], id[dev_num], THIS_MODULE, 0);
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index[dev_num], id[dev_num], THIS_MODULE, 0,
+                              &card);
+        if (err < 0)
+                return err;
 
         strcpy(card->driver, "AMD7930");
         strcpy(card->shortname, "Sun AMD7930");
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index 41c387587474..7d93fa705ccf 100644
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -1563,6 +1563,7 @@ static int __init cs4231_attach_begin(struct snd_card **rcard)
 {
         struct snd_card *card;
         struct snd_cs4231 *chip;
+        int err;
 
         *rcard = NULL;
 
@@ -1574,10 +1575,10 @@ static int __init cs4231_attach_begin(struct snd_card **rcard)
                 return -ENOENT;
         }
 
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE,
-                            sizeof(struct snd_cs4231));
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
+                              sizeof(struct snd_cs4231), &card);
+        if (err < 0)
+                return err;
 
         strcpy(card->driver, "CS4231");
         strcpy(card->shortname, "Sun CS4231");
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c
index 23ed6f04a718..af95ff1e126c 100644
--- a/sound/sparc/dbri.c
+++ b/sound/sparc/dbri.c
@@ -2612,10 +2612,10 @@ static int __devinit dbri_probe(struct of_device *op, const struct of_device_id
                 return -ENODEV;
         }
 
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE,
-                            sizeof(struct snd_dbri));
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
+                              sizeof(struct snd_dbri), &card);
+        if (err < 0)
+                return err;
 
         strcpy(card->driver, "DBRI");
         strcpy(card->shortname, "Sun DBRI");