diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-07-22 02:43:24 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-07-22 02:43:24 -0400 |
| commit | 7d339ae99758bc21033d4a19bcd4f7b55f96e24e (patch) | |
| tree | a5bb46e47f7c4ae193cdf1a73c361144d6099df8 /sound/pcmcia | |
| parent | 13b137ef0367237909bb2dc38babfb8305154676 (diff) | |
| parent | 000477a0fe1af14355a52622a77ccce8bfd7230d (diff) | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pcmcia')
| -rw-r--r-- | sound/pcmcia/pdaudiocf/pdaudiocf.c | 2 | ||||
| -rw-r--r-- | sound/pcmcia/vx/vxpocket.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c index ce33be0e4e98..66488a7a5706 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) | |||
| 223 | if (ret) | 223 | if (ret) |
| 224 | goto failed; | 224 | goto failed; |
| 225 | 225 | ||
| 226 | ret = pcmcia_request_exclusive_irq(link, pdacf_interrupt); | 226 | ret = pcmcia_request_irq(link, pdacf_interrupt); |
| 227 | if (ret) | 227 | if (ret) |
| 228 | goto failed; | 228 | goto failed; |
| 229 | 229 | ||
diff --git a/sound/pcmcia/vx/vxpocket.c b/sound/pcmcia/vx/vxpocket.c index d9ef21d8fa73..31777d1ea49f 100644 --- a/sound/pcmcia/vx/vxpocket.c +++ b/sound/pcmcia/vx/vxpocket.c | |||
| @@ -229,7 +229,7 @@ static int vxpocket_config(struct pcmcia_device *link) | |||
| 229 | if (ret) | 229 | if (ret) |
| 230 | goto failed; | 230 | goto failed; |
| 231 | 231 | ||
| 232 | ret = pcmcia_request_exclusive_irq(link, snd_vx_irq_handler); | 232 | ret = pcmcia_request_irq(link, snd_vx_irq_handler); |
| 233 | if (ret) | 233 | if (ret) |
| 234 | goto failed; | 234 | goto failed; |
| 235 | 235 | ||