aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/ctxfi/cthw20k2.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-06-14 02:56:42 -0400
committerTakashi Iwai <tiwai@suse.de>2011-06-14 02:56:42 -0400
commit85e4d95da091e35209338962eca232e70819a485 (patch)
tree8d1e9139d8b4187e639bf721c0818f49c0f22b85 /sound/pci/ctxfi/cthw20k2.c
parentb028b81835d7503d68b230446cd5e39d14ff5b9f (diff)
parentce1fd36932f230ac1757914b1e99b555c95bae8f (diff)
Merge branch 'test/pci-rename' into topic/misc
Diffstat (limited to 'sound/pci/ctxfi/cthw20k2.c')
-rw-r--r--sound/pci/ctxfi/cthw20k2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/ctxfi/cthw20k2.c b/sound/pci/ctxfi/cthw20k2.c
index ea559a9e2934..1aa083272703 100644
--- a/sound/pci/ctxfi/cthw20k2.c
+++ b/sound/pci/ctxfi/cthw20k2.c
@@ -2064,7 +2064,7 @@ static int hw_card_start(struct hw *hw)
2064 2064
2065 if (hw->irq < 0) { 2065 if (hw->irq < 0) {
2066 err = request_irq(pci->irq, ct_20k2_interrupt, IRQF_SHARED, 2066 err = request_irq(pci->irq, ct_20k2_interrupt, IRQF_SHARED,
2067 "ctxfi", hw); 2067 KBUILD_MODNAME, hw);
2068 if (err < 0) { 2068 if (err < 0) {
2069 printk(KERN_ERR "XFi: Cannot get irq %d\n", pci->irq); 2069 printk(KERN_ERR "XFi: Cannot get irq %d\n", pci->irq);
2070 goto error2; 2070 goto error2;