summaryrefslogtreecommitdiffstats
path: root/sound/pci/azt3328.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-08-08 10:45:31 +0200
committerTakashi Iwai <tiwai@suse.de>2011-08-08 10:45:31 +0200
commit8c285645ab3b05942124020b5f0b89d3b539823a (patch)
treedb15972689f7f0b794244294836a1233beb37dd4 /sound/pci/azt3328.c
parent151798f872d6b386d82cd1707ad703e981fef8f2 (diff)
parent844970916c8e50f630ea1a6ac82f09c42b12660a (diff)
downloadop-kernel-dev-8c285645ab3b05942124020b5f0b89d3b539823a.zip
op-kernel-dev-8c285645ab3b05942124020b5f0b89d3b539823a.tar.gz
Merge branch 'wm8996-rename' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc
Diffstat (limited to 'sound/pci/azt3328.c')
-rw-r--r--sound/pci/azt3328.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c
index 9b7a634..e4d76a2 100644
--- a/sound/pci/azt3328.c
+++ b/sound/pci/azt3328.c
@@ -2559,7 +2559,7 @@ snd_azf3328_create(struct snd_card *card,
codec_setup->name = "I2S_OUT";
if (request_irq(pci->irq, snd_azf3328_interrupt,
- IRQF_SHARED, card->shortname, chip)) {
+ IRQF_SHARED, KBUILD_MODNAME, chip)) {
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
err = -EBUSY;
goto out_err;
@@ -2860,7 +2860,7 @@ snd_azf3328_resume(struct pci_dev *pci)
static struct pci_driver driver = {
- .name = "AZF3328",
+ .name = KBUILD_MODNAME,
.id_table = snd_azf3328_ids,
.probe = snd_azf3328_probe,
.remove = __devexit_p(snd_azf3328_remove),
OpenPOWER on IntegriCloud