diff options
Diffstat (limited to 'drivers/parport')
-rw-r--r-- | drivers/parport/parport_cs.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c index 7dd370fa3439..80c9052bf3cd 100644 --- a/drivers/parport/parport_cs.c +++ b/drivers/parport/parport_cs.c | |||
@@ -105,7 +105,6 @@ static int parport_probe(struct pcmcia_device *link) | |||
105 | 105 | ||
106 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; | 106 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; |
107 | link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; | 107 | link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; |
108 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; | ||
109 | link->conf.Attributes = CONF_ENABLE_IRQ; | 108 | link->conf.Attributes = CONF_ENABLE_IRQ; |
110 | link->conf.IntType = INT_MEMORY_AND_IO; | 109 | link->conf.IntType = INT_MEMORY_AND_IO; |
111 | 110 | ||
@@ -174,20 +173,19 @@ static int parport_config(struct pcmcia_device *link) | |||
174 | if (ret) | 173 | if (ret) |
175 | goto failed; | 174 | goto failed; |
176 | 175 | ||
177 | ret = pcmcia_request_irq(link, &link->irq); | 176 | if (!link->irq) |
178 | if (ret) | ||
179 | goto failed; | 177 | goto failed; |
180 | ret = pcmcia_request_configuration(link, &link->conf); | 178 | ret = pcmcia_request_configuration(link, &link->conf); |
181 | if (ret) | 179 | if (ret) |
182 | goto failed; | 180 | goto failed; |
183 | 181 | ||
184 | p = parport_pc_probe_port(link->io.BasePort1, link->io.BasePort2, | 182 | p = parport_pc_probe_port(link->io.BasePort1, link->io.BasePort2, |
185 | link->irq.AssignedIRQ, PARPORT_DMA_NONE, | 183 | link->irq, PARPORT_DMA_NONE, |
186 | &link->dev, IRQF_SHARED); | 184 | &link->dev, IRQF_SHARED); |
187 | if (p == NULL) { | 185 | if (p == NULL) { |
188 | printk(KERN_NOTICE "parport_cs: parport_pc_probe_port() at " | 186 | printk(KERN_NOTICE "parport_cs: parport_pc_probe_port() at " |
189 | "0x%3x, irq %u failed\n", link->io.BasePort1, | 187 | "0x%3x, irq %u failed\n", link->io.BasePort1, |
190 | link->irq.AssignedIRQ); | 188 | link->irq); |
191 | goto failed; | 189 | goto failed; |
192 | } | 190 | } |
193 | 191 | ||