diff options
Diffstat (limited to 'sound/pcmcia/vx')
-rw-r--r-- | sound/pcmcia/vx/vxpocket.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sound/pcmcia/vx/vxpocket.c b/sound/pcmcia/vx/vxpocket.c index cfd1438bcc64..5eced7a7c987 100644 --- a/sound/pcmcia/vx/vxpocket.c +++ b/sound/pcmcia/vx/vxpocket.c | |||
@@ -162,10 +162,6 @@ static int snd_vxpocket_new(struct snd_card *card, int ibl, | |||
162 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; | 162 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; |
163 | link->io.NumPorts1 = 16; | 163 | link->io.NumPorts1 = 16; |
164 | 164 | ||
165 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; | ||
166 | |||
167 | link->irq.Handler = &snd_vx_irq_handler; | ||
168 | |||
169 | link->conf.Attributes = CONF_ENABLE_IRQ; | 165 | link->conf.Attributes = CONF_ENABLE_IRQ; |
170 | link->conf.IntType = INT_MEMORY_AND_IO; | 166 | link->conf.IntType = INT_MEMORY_AND_IO; |
171 | link->conf.ConfigIndex = 1; | 167 | link->conf.ConfigIndex = 1; |
@@ -235,7 +231,7 @@ static int vxpocket_config(struct pcmcia_device *link) | |||
235 | if (ret) | 231 | if (ret) |
236 | goto failed; | 232 | goto failed; |
237 | 233 | ||
238 | ret = pcmcia_request_irq(link, &link->irq); | 234 | ret = pcmcia_request_exclusive_irq(link, snd_vx_irq_handler); |
239 | if (ret) | 235 | if (ret) |
240 | goto failed; | 236 | goto failed; |
241 | 237 | ||
@@ -246,7 +242,7 @@ static int vxpocket_config(struct pcmcia_device *link) | |||
246 | chip->dev = &link->dev; | 242 | chip->dev = &link->dev; |
247 | snd_card_set_dev(chip->card, chip->dev); | 243 | snd_card_set_dev(chip->card, chip->dev); |
248 | 244 | ||
249 | if (snd_vxpocket_assign_resources(chip, link->io.BasePort1, link->irq.AssignedIRQ) < 0) | 245 | if (snd_vxpocket_assign_resources(chip, link->io.BasePort1, link->irq) < 0) |
250 | goto failed; | 246 | goto failed; |
251 | 247 | ||
252 | link->dev_node = &vxp->node; | 248 | link->dev_node = &vxp->node; |