diff options
Diffstat (limited to 'drivers/net/pcmcia/com20020_cs.c')
-rw-r--r-- | drivers/net/pcmcia/com20020_cs.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/pcmcia/com20020_cs.c b/drivers/net/pcmcia/com20020_cs.c index 21d9c9d815d1..278438beb915 100644 --- a/drivers/net/pcmcia/com20020_cs.c +++ b/drivers/net/pcmcia/com20020_cs.c | |||
@@ -163,7 +163,6 @@ static int com20020_probe(struct pcmcia_device *p_dev) | |||
163 | p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; | 163 | p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; |
164 | p_dev->io.NumPorts1 = 16; | 164 | p_dev->io.NumPorts1 = 16; |
165 | p_dev->io.IOAddrLines = 16; | 165 | p_dev->io.IOAddrLines = 16; |
166 | p_dev->irq.Attributes = IRQ_TYPE_EXCLUSIVE; | ||
167 | p_dev->conf.Attributes = CONF_ENABLE_IRQ; | 166 | p_dev->conf.Attributes = CONF_ENABLE_IRQ; |
168 | p_dev->conf.IntType = INT_MEMORY_AND_IO; | 167 | p_dev->conf.IntType = INT_MEMORY_AND_IO; |
169 | 168 | ||
@@ -275,15 +274,14 @@ static int com20020_config(struct pcmcia_device *link) | |||
275 | dev_dbg(&link->dev, "got ioaddr %Xh\n", ioaddr); | 274 | dev_dbg(&link->dev, "got ioaddr %Xh\n", ioaddr); |
276 | 275 | ||
277 | dev_dbg(&link->dev, "request IRQ %d\n", | 276 | dev_dbg(&link->dev, "request IRQ %d\n", |
278 | link->irq.AssignedIRQ); | 277 | link->irq); |
279 | i = pcmcia_request_irq(link, &link->irq); | 278 | if (!link->irq) |
280 | if (i != 0) | ||
281 | { | 279 | { |
282 | dev_dbg(&link->dev, "requestIRQ failed totally!\n"); | 280 | dev_dbg(&link->dev, "requestIRQ failed totally!\n"); |
283 | goto failed; | 281 | goto failed; |
284 | } | 282 | } |
285 | 283 | ||
286 | dev->irq = link->irq.AssignedIRQ; | 284 | dev->irq = link->irq; |
287 | 285 | ||
288 | ret = pcmcia_request_configuration(link, &link->conf); | 286 | ret = pcmcia_request_configuration(link, &link->conf); |
289 | if (ret) | 287 | if (ret) |