diff options
Diffstat (limited to 'drivers/net/wireless/ray_cs.c')
| -rw-r--r-- | drivers/net/wireless/ray_cs.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index b83d5ef1dffe..7eb339af351b 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c | |||
| @@ -393,7 +393,6 @@ static int ray_config(struct pcmcia_device *link) | |||
| 393 | int ret = 0; | 393 | int ret = 0; |
| 394 | int i; | 394 | int i; |
| 395 | win_req_t req; | 395 | win_req_t req; |
| 396 | memreq_t mem; | ||
| 397 | struct net_device *dev = (struct net_device *)link->priv; | 396 | struct net_device *dev = (struct net_device *)link->priv; |
| 398 | ray_dev_t *local = netdev_priv(dev); | 397 | ray_dev_t *local = netdev_priv(dev); |
| 399 | 398 | ||
| @@ -430,9 +429,7 @@ static int ray_config(struct pcmcia_device *link) | |||
| 430 | ret = pcmcia_request_window(link, &req, &link->win); | 429 | ret = pcmcia_request_window(link, &req, &link->win); |
| 431 | if (ret) | 430 | if (ret) |
| 432 | goto failed; | 431 | goto failed; |
| 433 | mem.CardOffset = 0x0000; | 432 | ret = pcmcia_map_mem_page(link, link->win, 0); |
| 434 | mem.Page = 0; | ||
| 435 | ret = pcmcia_map_mem_page(link, link->win, &mem); | ||
| 436 | if (ret) | 433 | if (ret) |
| 437 | goto failed; | 434 | goto failed; |
| 438 | local->sram = ioremap(req.Base, req.Size); | 435 | local->sram = ioremap(req.Base, req.Size); |
| @@ -446,9 +443,7 @@ static int ray_config(struct pcmcia_device *link) | |||
| 446 | ret = pcmcia_request_window(link, &req, &local->rmem_handle); | 443 | ret = pcmcia_request_window(link, &req, &local->rmem_handle); |
| 447 | if (ret) | 444 | if (ret) |
| 448 | goto failed; | 445 | goto failed; |
| 449 | mem.CardOffset = 0x8000; | 446 | ret = pcmcia_map_mem_page(link, local->rmem_handle, 0x8000); |
| 450 | mem.Page = 0; | ||
| 451 | ret = pcmcia_map_mem_page(link, local->rmem_handle, &mem); | ||
| 452 | if (ret) | 447 | if (ret) |
| 453 | goto failed; | 448 | goto failed; |
| 454 | local->rmem = ioremap(req.Base, req.Size); | 449 | local->rmem = ioremap(req.Base, req.Size); |
| @@ -462,9 +457,7 @@ static int ray_config(struct pcmcia_device *link) | |||
| 462 | ret = pcmcia_request_window(link, &req, &local->amem_handle); | 457 | ret = pcmcia_request_window(link, &req, &local->amem_handle); |
| 463 | if (ret) | 458 | if (ret) |
| 464 | goto failed; | 459 | goto failed; |
| 465 | mem.CardOffset = 0x0000; | 460 | ret = pcmcia_map_mem_page(link, local->amem_handle, 0); |
| 466 | mem.Page = 0; | ||
| 467 | ret = pcmcia_map_mem_page(link, local->amem_handle, &mem); | ||
| 468 | if (ret) | 461 | if (ret) |
| 469 | goto failed; | 462 | goto failed; |
| 470 | local->amem = ioremap(req.Base, req.Size); | 463 | local->amem = ioremap(req.Base, req.Size); |
