diff options
Diffstat (limited to 'drivers/net/pcmcia/xirc2ps_cs.c')
-rw-r--r-- | drivers/net/pcmcia/xirc2ps_cs.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c index b57f022952b4..b0de704f229c 100644 --- a/drivers/net/pcmcia/xirc2ps_cs.c +++ b/drivers/net/pcmcia/xirc2ps_cs.c | |||
@@ -724,7 +724,6 @@ xirc2ps_config_modem(struct pcmcia_device *p_dev, | |||
724 | 724 | ||
725 | if (cf->io.nwin > 0 && (cf->io.win[0].base & 0xf) == 8) { | 725 | if (cf->io.nwin > 0 && (cf->io.win[0].base & 0xf) == 8) { |
726 | for (ioaddr = 0x300; ioaddr < 0x400; ioaddr += 0x10) { | 726 | for (ioaddr = 0x300; ioaddr < 0x400; ioaddr += 0x10) { |
727 | p_dev->conf.ConfigIndex = cf->index ; | ||
728 | p_dev->io.BasePort2 = cf->io.win[0].base; | 727 | p_dev->io.BasePort2 = cf->io.win[0].base; |
729 | p_dev->io.BasePort1 = ioaddr; | 728 | p_dev->io.BasePort1 = ioaddr; |
730 | if (!pcmcia_request_io(p_dev, &p_dev->io)) | 729 | if (!pcmcia_request_io(p_dev, &p_dev->io)) |
@@ -742,7 +741,6 @@ xirc2ps_config_check(struct pcmcia_device *p_dev, | |||
742 | int *pass = priv_data; | 741 | int *pass = priv_data; |
743 | 742 | ||
744 | if (cf->io.nwin > 0 && (cf->io.win[0].base & 0xf) == 8) { | 743 | if (cf->io.nwin > 0 && (cf->io.win[0].base & 0xf) == 8) { |
745 | p_dev->conf.ConfigIndex = cf->index ; | ||
746 | p_dev->io.BasePort2 = cf->io.win[0].base; | 744 | p_dev->io.BasePort2 = cf->io.win[0].base; |
747 | p_dev->io.BasePort1 = p_dev->io.BasePort2 | 745 | p_dev->io.BasePort1 = p_dev->io.BasePort2 |
748 | + (*pass ? (cf->index & 0x20 ? -24:8) | 746 | + (*pass ? (cf->index & 0x20 ? -24:8) |