ALSA: hda - use WARN_ON_ONCE() for zero-division detection

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

diff --git a/sound/pci/cs5530.c b/sound/pci/cs5530.c
index 4ba2db2..dc46432 100644 (file)
--- a/sound/pci/cs5530.c
+++ b/sound/pci/cs5530.c
@@ -132,7 +132,7 @@ static int __devinit snd_cs5530_create(struct snd_card *card,
        }
        chip->pci_base = pci_resource_start(pci, 0);
 
-       mem = ioremap_nocache(chip->pci_base, pci_resource_len(pci, 0));
+       mem = pci_ioremap_bar(pci, 0);
        if (mem == NULL) {
                kfree(chip);
                pci_disable_device(pci);
@@ -258,10 +258,10 @@ static int __devinit snd_cs5530_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;
 
        err = snd_cs5530_create(card, pci, &chip);
        if (err < 0) {