diff options
Diffstat (limited to 'drivers/char/pcmcia/ipwireless/main.c')
-rw-r--r-- | drivers/char/pcmcia/ipwireless/main.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/char/pcmcia/ipwireless/main.c b/drivers/char/pcmcia/ipwireless/main.c index 5f87b9f7b6d2..6c4aa4b0be99 100644 --- a/drivers/char/pcmcia/ipwireless/main.c +++ b/drivers/char/pcmcia/ipwireless/main.c | |||
@@ -84,8 +84,6 @@ static int ipwireless_probe(struct pcmcia_device *p_dev, | |||
84 | { | 84 | { |
85 | struct ipw_dev *ipw = priv_data; | 85 | struct ipw_dev *ipw = priv_data; |
86 | struct resource *io_resource; | 86 | struct resource *io_resource; |
87 | memreq_t memreq_attr_memory; | ||
88 | memreq_t memreq_common_memory; | ||
89 | int ret; | 87 | int ret; |
90 | 88 | ||
91 | p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO; | 89 | p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO; |
@@ -121,11 +119,8 @@ static int ipwireless_probe(struct pcmcia_device *p_dev, | |||
121 | if (ret != 0) | 119 | if (ret != 0) |
122 | goto exit1; | 120 | goto exit1; |
123 | 121 | ||
124 | memreq_common_memory.CardOffset = cfg->mem.win[0].card_addr; | ||
125 | memreq_common_memory.Page = 0; | ||
126 | |||
127 | ret = pcmcia_map_mem_page(p_dev, ipw->handle_common_memory, | 122 | ret = pcmcia_map_mem_page(p_dev, ipw->handle_common_memory, |
128 | &memreq_common_memory); | 123 | cfg->mem.win[0].card_addr); |
129 | 124 | ||
130 | if (ret != 0) | 125 | if (ret != 0) |
131 | goto exit2; | 126 | goto exit2; |
@@ -150,12 +145,7 @@ static int ipwireless_probe(struct pcmcia_device *p_dev, | |||
150 | if (ret != 0) | 145 | if (ret != 0) |
151 | goto exit2; | 146 | goto exit2; |
152 | 147 | ||
153 | memreq_attr_memory.CardOffset = 0; | 148 | ret = pcmcia_map_mem_page(p_dev, ipw->handle_attr_memory, 0); |
154 | memreq_attr_memory.Page = 0; | ||
155 | |||
156 | ret = pcmcia_map_mem_page(p_dev, ipw->handle_attr_memory, | ||
157 | &memreq_attr_memory); | ||
158 | |||
159 | if (ret != 0) | 149 | if (ret != 0) |
160 | goto exit3; | 150 | goto exit3; |
161 | 151 | ||