aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia/fmvj18x_cs.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/pcmcia/fmvj18x_cs.c')
-rw-r--r--drivers/net/pcmcia/fmvj18x_cs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
index 95a991beaa30..bba6369a028e 100644
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
@@ -315,7 +315,7 @@ static int ungermann_try_io_port(struct pcmcia_device *link)
315 if (ret == 0) { 315 if (ret == 0) {
316 /* calculate ConfigIndex value */ 316 /* calculate ConfigIndex value */
317 link->conf.ConfigIndex = 317 link->conf.ConfigIndex =
318 ((link->io.BasePort1 & 0x0f0) >> 3) | 0x22; 318 ((link->resource[0]->start & 0x0f0) >> 3) | 0x22;
319 return ret; 319 return ret;
320 } 320 }
321 } 321 }
@@ -436,9 +436,9 @@ static int fmvj18x_config(struct pcmcia_device *link)
436 goto failed; 436 goto failed;
437 437
438 dev->irq = link->irq; 438 dev->irq = link->irq;
439 dev->base_addr = link->io.BasePort1; 439 dev->base_addr = link->resource[0]->start;
440 440
441 if (link->io.BasePort2 != 0) { 441 if (resource_size(link->resource[1]) != 0) {
442 ret = fmvj18x_setup_mfc(link); 442 ret = fmvj18x_setup_mfc(link);
443 if (ret != 0) goto failed; 443 if (ret != 0) goto failed;
444 } 444 }