diff options
Diffstat (limited to 'sound/pcmcia/vx/vxpocket.c')
-rw-r--r-- | sound/pcmcia/vx/vxpocket.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/pcmcia/vx/vxpocket.c b/sound/pcmcia/vx/vxpocket.c index 1492744ad67f..7be3b3357045 100644 --- a/sound/pcmcia/vx/vxpocket.c +++ b/sound/pcmcia/vx/vxpocket.c | |||
@@ -161,11 +161,9 @@ static int snd_vxpocket_new(struct snd_card *card, int ibl, | |||
161 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; | 161 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; |
162 | link->io.NumPorts1 = 16; | 162 | link->io.NumPorts1 = 16; |
163 | 163 | ||
164 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT; | 164 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; |
165 | 165 | ||
166 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
167 | link->irq.Handler = &snd_vx_irq_handler; | 166 | link->irq.Handler = &snd_vx_irq_handler; |
168 | link->irq.Instance = chip; | ||
169 | 167 | ||
170 | link->conf.Attributes = CONF_ENABLE_IRQ; | 168 | link->conf.Attributes = CONF_ENABLE_IRQ; |
171 | link->conf.IntType = INT_MEMORY_AND_IO; | 169 | link->conf.IntType = INT_MEMORY_AND_IO; |
@@ -244,7 +242,7 @@ static int vxpocket_config(struct pcmcia_device *link) | |||
244 | if (ret) | 242 | if (ret) |
245 | goto failed; | 243 | goto failed; |
246 | 244 | ||
247 | chip->dev = &handle_to_dev(link); | 245 | chip->dev = &link->dev; |
248 | snd_card_set_dev(chip->card, chip->dev); | 246 | snd_card_set_dev(chip->card, chip->dev); |
249 | 247 | ||
250 | if (snd_vxpocket_assign_resources(chip, link->io.BasePort1, link->irq.AssignedIRQ) < 0) | 248 | if (snd_vxpocket_assign_resources(chip, link->io.BasePort1, link->irq.AssignedIRQ) < 0) |