diff options
Diffstat (limited to 'sound/pcmcia/pdaudiocf')
-rw-r--r-- | sound/pcmcia/pdaudiocf/pdaudiocf.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c index dcf85390c5f9..60fddf363d54 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf.c +++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c | |||
@@ -142,11 +142,6 @@ static int snd_pdacf_probe(struct pcmcia_device *link) | |||
142 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; | 142 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; |
143 | link->io.NumPorts1 = 16; | 143 | link->io.NumPorts1 = 16; |
144 | 144 | ||
145 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; | ||
146 | /* FIXME: This driver should be updated to allow for dynamic IRQ sharing */ | ||
147 | /* link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; */ | ||
148 | |||
149 | link->irq.Handler = pdacf_interrupt; | ||
150 | link->conf.Attributes = CONF_ENABLE_IRQ | CONF_ENABLE_PULSE_IRQ; | 145 | link->conf.Attributes = CONF_ENABLE_IRQ | CONF_ENABLE_PULSE_IRQ; |
151 | link->conf.IntType = INT_MEMORY_AND_IO; | 146 | link->conf.IntType = INT_MEMORY_AND_IO; |
152 | link->conf.ConfigIndex = 1; | 147 | link->conf.ConfigIndex = 1; |
@@ -228,7 +223,7 @@ static int pdacf_config(struct pcmcia_device *link) | |||
228 | if (ret) | 223 | if (ret) |
229 | goto failed; | 224 | goto failed; |
230 | 225 | ||
231 | ret = pcmcia_request_irq(link, &link->irq); | 226 | ret = pcmcia_request_exclusive_irq(link, pdacf_interrupt); |
232 | if (ret) | 227 | if (ret) |
233 | goto failed; | 228 | goto failed; |
234 | 229 | ||
@@ -236,7 +231,7 @@ static int pdacf_config(struct pcmcia_device *link) | |||
236 | if (ret) | 231 | if (ret) |
237 | goto failed; | 232 | goto failed; |
238 | 233 | ||
239 | if (snd_pdacf_assign_resources(pdacf, link->io.BasePort1, link->irq.AssignedIRQ) < 0) | 234 | if (snd_pdacf_assign_resources(pdacf, link->io.BasePort1, link->irq) < 0) |
240 | goto failed; | 235 | goto failed; |
241 | 236 | ||
242 | link->dev_node = &pdacf->node; | 237 | link->dev_node = &pdacf->node; |