aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2006-12-13 05:46:38 -0500
committerDominik Brodowski <linux@dominikbrodowski.net>2009-11-28 12:01:26 -0500
commitf5560da549ea2e32dd41e36548c0e7dee3d4aabb (patch)
tree604c41db48ba2e497857ceb2137099d2f0d96d3b /drivers/char
parent78a14e273d93dfbea9673f9b10398c538096302d (diff)
pcmcia: Pass struct pcmcia_device to pcmcia_release_window()
No logic changes, just pass struct pcmcia_device to pcmcia_release_window(). [linux@dominikbrodowski.net: update to 2.6.31] CC: netdev@vger.kernel.org CC: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/pcmcia/ipwireless/main.c14
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
170exit3: 170exit3:
171 pcmcia_release_window(ipw->handle_attr_memory); 171 pcmcia_release_window(p_dev, ipw->handle_attr_memory);
172exit2: 172exit2:
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);
180exit1: 180exit1:
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);