summaryrefslogtreecommitdiffstats
path: root/sound/pcmcia/pdaudiocf
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/pcmcia/pdaudiocf
parent151798f872d6b386d82cd1707ad703e981fef8f2 (diff)
parent844970916c8e50f630ea1a6ac82f09c42b12660a (diff)
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/pcmcia/pdaudiocf')
-rw-r--r--sound/pcmcia/pdaudiocf/pdaudiocf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c
index ce33be0e4e9..66488a7a570 100644
--- a/sound/pcmcia/pdaudiocf/pdaudiocf.c
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c
@@ -223,7 +223,7 @@ static int pdacf_config(struct pcmcia_device *link)
if (ret)
goto failed;
- ret = pcmcia_request_exclusive_irq(link, pdacf_interrupt);
+ ret = pcmcia_request_irq(link, pdacf_interrupt);
if (ret)
goto failed;