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