ALSA: lola: NULL dereference on probe failure

[pandora-kernel.git] / sound / pci / lola / lola.c

diff --git a/sound/pci/lola/lola.c b/sound/pci/lola/lola.c
index 68824cd..4cf4be5 100644 (file)
--- a/sound/pci/lola/lola.c
+++ b/sound/pci/lola/lola.c
@@ -719,7 +719,7 @@ static int lola_probe(struct pci_dev *pci,
        err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
                           0, &card);
        if (err < 0) {
-               dev_err(card->dev, "Error creating card!\n");
+               dev_err(&pci->dev, "Error creating card!\n");
                return err;
        }
 
@@ -760,7 +760,7 @@ static void lola_remove(struct pci_dev *pci)
 }
 
 /* PCI IDs */
-static DEFINE_PCI_DEVICE_TABLE(lola_ids) = {
+static const struct pci_device_id lola_ids[] = {
        { PCI_VDEVICE(DIGIGRAM, 0x0001) },
        { 0, }
 };