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

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

diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
index 17674b3406bd234b683e0ed1639af3ed9963da35..18f4d1e98c46945c63c0a2c80c64e1fcc198bde8 100644 (file)
--- a/sound/pci/ens1370.c
+++ b/sound/pci/ens1370.c
@@ -2410,9 +2410,9 @@ static int __devinit snd_audiopci_probe(struct pci_dev *pci,
                return -ENOENT;
        }
 
-       card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-       if (card == NULL)
-               return -ENOMEM;
+       err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+       if (err < 0)
+               return err;
 
        if ((err = snd_ensoniq_create(card, pci, &ensoniq)) < 0) {
                snd_card_free(card);