diff options
Diffstat (limited to 'sound/pci/intel8x0m.c')
-rw-r--r-- | sound/pci/intel8x0m.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c index f3353b49c785..7c161645d865 100644 --- a/sound/pci/intel8x0m.c +++ b/sound/pci/intel8x0m.c | |||
@@ -1047,7 +1047,7 @@ static int intel8x0m_resume(struct pci_dev *pci) | |||
1047 | } | 1047 | } |
1048 | pci_set_master(pci); | 1048 | pci_set_master(pci); |
1049 | if (request_irq(pci->irq, snd_intel8x0m_interrupt, | 1049 | if (request_irq(pci->irq, snd_intel8x0m_interrupt, |
1050 | IRQF_SHARED, card->shortname, chip)) { | 1050 | IRQF_SHARED, KBUILD_MODNAME, chip)) { |
1051 | printk(KERN_ERR "intel8x0m: unable to grab IRQ %d, " | 1051 | printk(KERN_ERR "intel8x0m: unable to grab IRQ %d, " |
1052 | "disabling device\n", pci->irq); | 1052 | "disabling device\n", pci->irq); |
1053 | snd_card_disconnect(card); | 1053 | snd_card_disconnect(card); |
@@ -1174,7 +1174,7 @@ static int __devinit snd_intel8x0m_create(struct snd_card *card, | |||
1174 | 1174 | ||
1175 | port_inited: | 1175 | port_inited: |
1176 | if (request_irq(pci->irq, snd_intel8x0m_interrupt, IRQF_SHARED, | 1176 | if (request_irq(pci->irq, snd_intel8x0m_interrupt, IRQF_SHARED, |
1177 | card->shortname, chip)) { | 1177 | KBUILD_MODNAME, chip)) { |
1178 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 1178 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
1179 | snd_intel8x0m_free(chip); | 1179 | snd_intel8x0m_free(chip); |
1180 | return -EBUSY; | 1180 | return -EBUSY; |
@@ -1325,7 +1325,7 @@ static void __devexit snd_intel8x0m_remove(struct pci_dev *pci) | |||
1325 | } | 1325 | } |
1326 | 1326 | ||
1327 | static struct pci_driver driver = { | 1327 | static struct pci_driver driver = { |
1328 | .name = "Intel ICH Modem", | 1328 | .name = KBUILD_MODNAME, |
1329 | .id_table = snd_intel8x0m_ids, | 1329 | .id_table = snd_intel8x0m_ids, |
1330 | .probe = snd_intel8x0m_probe, | 1330 | .probe = snd_intel8x0m_probe, |
1331 | .remove = __devexit_p(snd_intel8x0m_remove), | 1331 | .remove = __devexit_p(snd_intel8x0m_remove), |