Merge branch 'topic/pcxhr' into for-linus

[safe/jmp/linux-2.6] / sound / pci / als300.c

diff --git a/sound/pci/als300.c b/sound/pci/als300.c
index a2c35c1..009b4c8 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;