aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia/nmclan_cs.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/pcmcia/nmclan_cs.c')
-rw-r--r--drivers/net/pcmcia/nmclan_cs.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c
index c717b143f11a..b779e3a0b4dd 100644
--- a/drivers/net/pcmcia/nmclan_cs.c
+++ b/drivers/net/pcmcia/nmclan_cs.c
@@ -463,8 +463,6 @@ static int nmclan_probe(struct pcmcia_device *link)
463 link->io.NumPorts1 = 32; 463 link->io.NumPorts1 = 32;
464 link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; 464 link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
465 link->io.IOAddrLines = 5; 465 link->io.IOAddrLines = 5;
466 link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
467 link->irq.Handler = mace_interrupt;
468 link->conf.Attributes = CONF_ENABLE_IRQ; 466 link->conf.Attributes = CONF_ENABLE_IRQ;
469 link->conf.IntType = INT_MEMORY_AND_IO; 467 link->conf.IntType = INT_MEMORY_AND_IO;
470 link->conf.ConfigIndex = 1; 468 link->conf.ConfigIndex = 1;
@@ -652,14 +650,14 @@ static int nmclan_config(struct pcmcia_device *link)
652 ret = pcmcia_request_io(link, &link->io); 650 ret = pcmcia_request_io(link, &link->io);
653 if (ret) 651 if (ret)
654 goto failed; 652 goto failed;
655 ret = pcmcia_request_irq(link, &link->irq); 653 ret = pcmcia_request_exclusive_irq(link, mace_interrupt);
656 if (ret) 654 if (ret)
657 goto failed; 655 goto failed;
658 ret = pcmcia_request_configuration(link, &link->conf); 656 ret = pcmcia_request_configuration(link, &link->conf);
659 if (ret) 657 if (ret)
660 goto failed; 658 goto failed;
661 659
662 dev->irq = link->irq.AssignedIRQ; 660 dev->irq = link->irq;
663 dev->base_addr = link->io.BasePort1; 661 dev->base_addr = link->io.BasePort1;
664 662
665 ioaddr = dev->base_addr; 663 ioaddr = dev->base_addr;