aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia/3c574_cs.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/pcmcia/3c574_cs.c')
-rw-r--r--drivers/net/pcmcia/3c574_cs.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c
index b5ea9b8cfd76..c683f77c6f42 100644
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/pcmcia/3c574_cs.c
@@ -278,8 +278,8 @@ static int tc574_probe(struct pcmcia_device *link)
278 lp->p_dev = link; 278 lp->p_dev = link;
279 279
280 spin_lock_init(&lp->window_lock); 280 spin_lock_init(&lp->window_lock);
281 link->io.NumPorts1 = 32; 281 link->resource[0]->end = 32;
282 link->io.Attributes1 = IO_DATA_PATH_WIDTH_16; 282 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_16;
283 link->conf.Attributes = CONF_ENABLE_IRQ; 283 link->conf.Attributes = CONF_ENABLE_IRQ;
284 link->conf.IntType = INT_MEMORY_AND_IO; 284 link->conf.IntType = INT_MEMORY_AND_IO;
285 link->conf.ConfigIndex = 1; 285 link->conf.ConfigIndex = 1;
@@ -337,10 +337,11 @@ static int tc574_config(struct pcmcia_device *link)
337 337
338 dev_dbg(&link->dev, "3c574_config()\n"); 338 dev_dbg(&link->dev, "3c574_config()\n");
339 339
340 link->io.IOAddrLines = 16; 340 link->io_lines = 16;
341
341 for (i = j = 0; j < 0x400; j += 0x20) { 342 for (i = j = 0; j < 0x400; j += 0x20) {
342 link->io.BasePort1 = j ^ 0x300; 343 link->resource[0]->start = j ^ 0x300;
343 i = pcmcia_request_io(link, &link->io); 344 i = pcmcia_request_io(link);
344 if (i == 0) 345 if (i == 0)
345 break; 346 break;
346 } 347 }