aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia/pcnet_cs.c
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-07-24 09:58:54 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2010-08-03 03:03:59 -0400
commit9a017a910346afd88ec2e065989903bf211a7d37 (patch)
treeb407945c6e762f252bb81ae0fd64c745bba2ad11 /drivers/net/pcmcia/pcnet_cs.c
parent2ce4905e4da9f512b38f56a53ece9da2072dd164 (diff)
pcmcia: do not use io_req_t after call to pcmcia_request_io()
After pcmcia_request_io(), do not make use of the values stored in io_req_t, but instead use those found in struct pcmcia_device->resource[]. CC: netdev@vger.kernel.org CC: linux-wireless@vger.kernel.org CC: linux-ide@vger.kernel.org CC: linux-usb@vger.kernel.org CC: laforge@gnumonks.org CC: linux-mtd@lists.infradead.org CC: alsa-devel@alsa-project.org CC: linux-serial@vger.kernel.org Acked-by: Marcel Holtmann <marcel@holtmann.org> (for drivers/bluetooth/) Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/net/pcmcia/pcnet_cs.c')
-rw-r--r--drivers/net/pcmcia/pcnet_cs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index db6dbdabb702..c9cd2377ef91 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -554,7 +554,7 @@ static int pcnet_config(struct pcmcia_device *link)
554 if (!link->irq) 554 if (!link->irq)
555 goto failed; 555 goto failed;
556 556
557 if (link->io.NumPorts2 == 8) { 557 if (resource_size(link->resource[1]) == 8) {
558 link->conf.Attributes |= CONF_ENABLE_SPKR; 558 link->conf.Attributes |= CONF_ENABLE_SPKR;
559 link->conf.Status = CCSR_AUDIO_ENA; 559 link->conf.Status = CCSR_AUDIO_ENA;
560 } 560 }
@@ -566,7 +566,7 @@ static int pcnet_config(struct pcmcia_device *link)
566 if (ret) 566 if (ret)
567 goto failed; 567 goto failed;
568 dev->irq = link->irq; 568 dev->irq = link->irq;
569 dev->base_addr = link->io.BasePort1; 569 dev->base_addr = link->resource[0]->start;
570 if (info->flags & HAS_MISC_REG) { 570 if (info->flags & HAS_MISC_REG) {
571 if ((if_port == 1) || (if_port == 2)) 571 if ((if_port == 1) || (if_port == 2))
572 dev->if_port = if_port; 572 dev->if_port = if_port;