pcmcia: do not use io_req_t after call to pcmcia_request_io()

[net-next-2.6.git] / drivers / net / wireless / libertas / if_cs.c

diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c
index 1d3a7e0e5f10842c1e30e1279662214befe429e0..be4c47594b59942b3a01aec0c64757f1350f7198 100644 (file)
--- a/drivers/net/wireless/libertas/if_cs.c
+++ b/drivers/net/wireless/libertas/if_cs.c
@@ -853,7 +853,8 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
                goto out1;
 
        /* Initialize io access */
-       card->iobase = ioport_map(p_dev->io.BasePort1, p_dev->io.NumPorts1);
+       card->iobase = ioport_map(p_dev->resource[0]->start,
+                               resource_size(p_dev->resource[0]));
        if (!card->iobase) {
                lbs_pr_err("error in ioport_map\n");
                ret = -EIO;
@@ -872,9 +873,7 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
        }
 
        /* Finally, report what we've done */
-       lbs_deb_cs("irq %d, io 0x%04x-0x%04x\n",
-              p_dev->irq, p_dev->io.BasePort1,
-              p_dev->io.BasePort1 + p_dev->io.NumPorts1 - 1);
+       lbs_deb_cs("irq %d, io %pR", p_dev->irq, p_dev->resource[0]);
 
        /*
         * Most of the libertas cards can do unaligned register access, but some