Merge branch 'topic/snd_card_new-err' into topic/drop-l3

[linux-2.6-omap-h63xx.git] / sound / pci / als300.c

diff --git a/sound/pci/als300.c b/sound/pci/als300.c
index a2c35c1081c3c39977b40830884f52d3967dd552..009b4c8225a5b976f6f2437c70c8664bfeb81daf 100644 (file)
--- a/sound/pci/als300.c
+++ b/sound/pci/als300.c
@@ -812,10 +812,10 @@ static int __devinit snd_als300_probe(struct pci_dev *pci,
                return -ENOENT;
        }
 
-       card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+       err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
 
-       if (card == NULL)
-               return -ENOMEM;
+       if (err < 0)
+               return err;
 
        chip_type = pci_id->driver_data;