diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-07-24 09:58:54 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-08-03 03:03:59 -0400 |
commit | 9a017a910346afd88ec2e065989903bf211a7d37 (patch) | |
tree | b407945c6e762f252bb81ae0fd64c745bba2ad11 /drivers/net/pcmcia/axnet_cs.c | |
parent | 2ce4905e4da9f512b38f56a53ece9da2072dd164 (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/axnet_cs.c')
-rw-r--r-- | drivers/net/pcmcia/axnet_cs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index ee0a6d036f94..c52fdf31cbfe 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/pcmcia/axnet_cs.c | |||
@@ -332,7 +332,7 @@ static int axnet_config(struct pcmcia_device *link) | |||
332 | if (!link->irq) | 332 | if (!link->irq) |
333 | goto failed; | 333 | goto failed; |
334 | 334 | ||
335 | if (link->io.NumPorts2 == 8) { | 335 | if (resource_size(link->resource[1]) == 8) { |
336 | link->conf.Attributes |= CONF_ENABLE_SPKR; | 336 | link->conf.Attributes |= CONF_ENABLE_SPKR; |
337 | link->conf.Status = CCSR_AUDIO_ENA; | 337 | link->conf.Status = CCSR_AUDIO_ENA; |
338 | } | 338 | } |
@@ -342,7 +342,7 @@ static int axnet_config(struct pcmcia_device *link) | |||
342 | goto failed; | 342 | goto failed; |
343 | 343 | ||
344 | dev->irq = link->irq; | 344 | dev->irq = link->irq; |
345 | dev->base_addr = link->io.BasePort1; | 345 | dev->base_addr = link->resource[0]->start; |
346 | 346 | ||
347 | if (!get_prom(link)) { | 347 | if (!get_prom(link)) { |
348 | printk(KERN_NOTICE "axnet_cs: this is not an AX88190 card!\n"); | 348 | printk(KERN_NOTICE "axnet_cs: this is not an AX88190 card!\n"); |