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 51e9cb0a6d1e..21d9c9d815d1 100644 --- a/drivers/net/pcmcia/com20020_cs.c +++ b/drivers/net/pcmcia/com20020_cs.c | |||
@@ -164,11 +164,10 @@ static int com20020_probe(struct pcmcia_device *p_dev) | |||
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; | 166 | p_dev->irq.Attributes = IRQ_TYPE_EXCLUSIVE; |
167 | p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
168 | p_dev->conf.Attributes = CONF_ENABLE_IRQ; | 167 | p_dev->conf.Attributes = CONF_ENABLE_IRQ; |
169 | p_dev->conf.IntType = INT_MEMORY_AND_IO; | 168 | p_dev->conf.IntType = INT_MEMORY_AND_IO; |
170 | 169 | ||
171 | p_dev->irq.Instance = info->dev = dev; | 170 | info->dev = dev; |
172 | p_dev->priv = info; | 171 | p_dev->priv = info; |
173 | 172 | ||
174 | return com20020_config(p_dev); | 173 | return com20020_config(p_dev); |
@@ -275,9 +274,8 @@ static int com20020_config(struct pcmcia_device *link) | |||
275 | ioaddr = dev->base_addr = link->io.BasePort1; | 274 | ioaddr = dev->base_addr = link->io.BasePort1; |
276 | dev_dbg(&link->dev, "got ioaddr %Xh\n", ioaddr); | 275 | dev_dbg(&link->dev, "got ioaddr %Xh\n", ioaddr); |
277 | 276 | ||
278 | dev_dbg(&link->dev, "request IRQ %d (%Xh/%Xh)\n", | 277 | dev_dbg(&link->dev, "request IRQ %d\n", |
279 | link->irq.AssignedIRQ, | 278 | link->irq.AssignedIRQ); |
280 | link->irq.IRQInfo1, link->irq.IRQInfo2); | ||
281 | i = pcmcia_request_irq(link, &link->irq); | 279 | i = pcmcia_request_irq(link, &link->irq); |
282 | if (i != 0) | 280 | if (i != 0) |
283 | { | 281 | { |