diff options
Diffstat (limited to 'drivers/char/pcmcia/ipwireless/main.c')
-rw-r--r-- | drivers/char/pcmcia/ipwireless/main.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/char/pcmcia/ipwireless/main.c b/drivers/char/pcmcia/ipwireless/main.c index 24bffa4ece49..91ca23d2b042 100644 --- a/drivers/char/pcmcia/ipwireless/main.c +++ b/drivers/char/pcmcia/ipwireless/main.c | |||
@@ -168,15 +168,15 @@ static int ipwireless_probe(struct pcmcia_device *p_dev, | |||
168 | return 0; | 168 | return 0; |
169 | 169 | ||
170 | exit3: | 170 | exit3: |
171 | pcmcia_release_window(ipw->handle_attr_memory); | 171 | pcmcia_release_window(p_dev, ipw->handle_attr_memory); |
172 | exit2: | 172 | exit2: |
173 | if (ipw->common_memory) { | 173 | if (ipw->common_memory) { |
174 | release_mem_region(ipw->request_common_memory.Base, | 174 | release_mem_region(ipw->request_common_memory.Base, |
175 | ipw->request_common_memory.Size); | 175 | ipw->request_common_memory.Size); |
176 | iounmap(ipw->common_memory); | 176 | iounmap(ipw->common_memory); |
177 | pcmcia_release_window(ipw->handle_common_memory); | 177 | pcmcia_release_window(p_dev, ipw->handle_common_memory); |
178 | } else | 178 | } else |
179 | pcmcia_release_window(ipw->handle_common_memory); | 179 | pcmcia_release_window(p_dev, ipw->handle_common_memory); |
180 | exit1: | 180 | exit1: |
181 | release_resource(io_resource); | 181 | release_resource(io_resource); |
182 | pcmcia_disable_device(p_dev); | 182 | pcmcia_disable_device(p_dev); |
@@ -260,13 +260,13 @@ exit: | |||
260 | release_mem_region(ipw->request_attr_memory.Base, | 260 | release_mem_region(ipw->request_attr_memory.Base, |
261 | ipw->request_attr_memory.Size); | 261 | ipw->request_attr_memory.Size); |
262 | iounmap(ipw->attr_memory); | 262 | iounmap(ipw->attr_memory); |
263 | pcmcia_release_window(ipw->handle_attr_memory); | 263 | pcmcia_release_window(link, ipw->handle_attr_memory); |
264 | } | 264 | } |
265 | if (ipw->common_memory) { | 265 | if (ipw->common_memory) { |
266 | release_mem_region(ipw->request_common_memory.Base, | 266 | release_mem_region(ipw->request_common_memory.Base, |
267 | ipw->request_common_memory.Size); | 267 | ipw->request_common_memory.Size); |
268 | iounmap(ipw->common_memory); | 268 | iounmap(ipw->common_memory); |
269 | pcmcia_release_window(ipw->handle_common_memory); | 269 | pcmcia_release_window(link, ipw->handle_common_memory); |
270 | } | 270 | } |
271 | pcmcia_disable_device(link); | 271 | pcmcia_disable_device(link); |
272 | return -1; | 272 | return -1; |
@@ -287,9 +287,9 @@ static void release_ipwireless(struct ipw_dev *ipw) | |||
287 | iounmap(ipw->attr_memory); | 287 | iounmap(ipw->attr_memory); |
288 | } | 288 | } |
289 | if (ipw->common_memory) | 289 | if (ipw->common_memory) |
290 | pcmcia_release_window(ipw->handle_common_memory); | 290 | pcmcia_release_window(ipw->link, ipw->handle_common_memory); |
291 | if (ipw->attr_memory) | 291 | if (ipw->attr_memory) |
292 | pcmcia_release_window(ipw->handle_attr_memory); | 292 | pcmcia_release_window(ipw->link, ipw->handle_attr_memory); |
293 | 293 | ||
294 | /* Break the link with Card Services */ | 294 | /* Break the link with Card Services */ |
295 | pcmcia_disable_device(ipw->link); | 295 | pcmcia_disable_device(ipw->link); |