summaryrefslogtreecommitdiffstats
path: root/sound/pci/maestro3.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-06-14 08:56:42 +0200
committerTakashi Iwai <tiwai@suse.de>2011-06-14 08:56:42 +0200
commit85e4d95da091e35209338962eca232e70819a485 (patch)
tree8d1e9139d8b4187e639bf721c0818f49c0f22b85 /sound/pci/maestro3.c
parentb028b81835d7503d68b230446cd5e39d14ff5b9f (diff)
parentce1fd36932f230ac1757914b1e99b555c95bae8f (diff)
Merge branch 'test/pci-rename' into topic/misc
Diffstat (limited to 'sound/pci/maestro3.c')
-rw-r--r--sound/pci/maestro3.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c
index 3c40d726b46e..64f6f627f4c2 100644
--- a/sound/pci/maestro3.c
+++ b/sound/pci/maestro3.c
@@ -2757,7 +2757,7 @@ snd_m3_create(struct snd_card *card, struct pci_dev *pci,
#endif
if (request_irq(pci->irq, snd_m3_interrupt, IRQF_SHARED,
- card->driver, chip)) {
+ KBUILD_MODNAME, chip)) {
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
snd_m3_free(chip);
return -ENOMEM;
@@ -2885,7 +2885,7 @@ static void __devexit snd_m3_remove(struct pci_dev *pci)
}
static struct pci_driver driver = {
- .name = "Maestro3",
+ .name = KBUILD_MODNAME,
.id_table = snd_m3_ids,
.probe = snd_m3_probe,
.remove = __devexit_p(snd_m3_remove),