aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/pcmcia/nsp_cs.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/pcmcia/nsp_cs.c')
-rw-r--r--drivers/scsi/pcmcia/nsp_cs.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index 8bb598bb440d..dd9b40306f3d 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -1661,7 +1661,6 @@ static int nsp_cs_config_check(struct pcmcia_device *p_dev,
1661 } 1661 }
1662 1662
1663 if ((cfg->mem.nwin > 0) || (dflt->mem.nwin > 0)) { 1663 if ((cfg->mem.nwin > 0) || (dflt->mem.nwin > 0)) {
1664 memreq_t map;
1665 cistpl_mem_t *mem = 1664 cistpl_mem_t *mem =
1666 (cfg->mem.nwin) ? &cfg->mem : &dflt->mem; 1665 (cfg->mem.nwin) ? &cfg->mem : &dflt->mem;
1667 cfg_mem->req.Attributes = WIN_DATA_WIDTH_16|WIN_MEMORY_TYPE_CM; 1666 cfg_mem->req.Attributes = WIN_DATA_WIDTH_16|WIN_MEMORY_TYPE_CM;
@@ -1673,8 +1672,8 @@ static int nsp_cs_config_check(struct pcmcia_device *p_dev,
1673 cfg_mem->req.AccessSpeed = 0; 1672 cfg_mem->req.AccessSpeed = 0;
1674 if (pcmcia_request_window(p_dev, &cfg_mem->req, &p_dev->win) != 0) 1673 if (pcmcia_request_window(p_dev, &cfg_mem->req, &p_dev->win) != 0)
1675 goto next_entry; 1674 goto next_entry;
1676 map.Page = 0; map.CardOffset = mem->win[0].card_addr; 1675 if (pcmcia_map_mem_page(p_dev, p_dev->win,
1677 if (pcmcia_map_mem_page(p_dev, p_dev->win, &map) != 0) 1676 mem->win[0].card_addr) != 0)
1678 goto next_entry; 1677 goto next_entry;
1679 1678
1680 cfg_mem->data->MmioAddress = (unsigned long) ioremap_nocache(cfg_mem->req.Base, cfg_mem->req.Size); 1679 cfg_mem->data->MmioAddress = (unsigned long) ioremap_nocache(cfg_mem->req.Base, cfg_mem->req.Size);