diff options
Diffstat (limited to 'drivers/net/wireless/airo_cs.c')
-rw-r--r-- | drivers/net/wireless/airo_cs.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c index d241b4aed71e..d47672cb4196 100644 --- a/drivers/net/wireless/airo_cs.c +++ b/drivers/net/wireless/airo_cs.c | |||
@@ -207,16 +207,14 @@ static int airo_cs_config_check(struct pcmcia_device *p_dev, | |||
207 | */ | 207 | */ |
208 | if ((cfg->mem.nwin > 0) || (dflt->mem.nwin > 0)) { | 208 | if ((cfg->mem.nwin > 0) || (dflt->mem.nwin > 0)) { |
209 | cistpl_mem_t *mem = (cfg->mem.nwin) ? &cfg->mem : &dflt->mem; | 209 | cistpl_mem_t *mem = (cfg->mem.nwin) ? &cfg->mem : &dflt->mem; |
210 | memreq_t map; | ||
211 | req->Attributes = WIN_DATA_WIDTH_16|WIN_MEMORY_TYPE_CM; | 210 | req->Attributes = WIN_DATA_WIDTH_16|WIN_MEMORY_TYPE_CM; |
212 | req->Base = mem->win[0].host_addr; | 211 | req->Base = mem->win[0].host_addr; |
213 | req->Size = mem->win[0].len; | 212 | req->Size = mem->win[0].len; |
214 | req->AccessSpeed = 0; | 213 | req->AccessSpeed = 0; |
215 | if (pcmcia_request_window(p_dev, req, &p_dev->win) != 0) | 214 | if (pcmcia_request_window(p_dev, req, &p_dev->win) != 0) |
216 | return -ENODEV; | 215 | return -ENODEV; |
217 | map.Page = 0; | 216 | if (pcmcia_map_mem_page(p_dev, p_dev->win, |
218 | map.CardOffset = mem->win[0].card_addr; | 217 | mem->win[0].card_addr) != 0) |
219 | if (pcmcia_map_mem_page(p_dev, p_dev->win, &map) != 0) | ||
220 | return -ENODEV; | 218 | return -ENODEV; |
221 | } | 219 | } |
222 | /* If we got this far, we're cool! */ | 220 | /* If we got this far, we're cool! */ |