aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia/pcnet_cs.c
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/net/pcmcia/pcnet_cs.c
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/net/pcmcia/pcnet_cs.c')
-rw-r--r--drivers/net/pcmcia/pcnet_cs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index 80ab9de1c4df..4156a6c5811e 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -337,7 +337,7 @@ static hw_info_t *get_hwinfo(struct pcmcia_device *link)
337 } 337 }
338 338
339 iounmap(virt); 339 iounmap(virt);
340 j = pcmcia_release_window(link->win); 340 j = pcmcia_release_window(link, link->win);
341 return (i < NR_INFO) ? hw_info+i : NULL; 341 return (i < NR_INFO) ? hw_info+i : NULL;
342} /* get_hwinfo */ 342} /* get_hwinfo */
343 343
@@ -1513,7 +1513,7 @@ static int setup_shmem_window(struct pcmcia_device *link, int start_pg,
1513 pcnet_reset_8390(dev); 1513 pcnet_reset_8390(dev);
1514 if (i != (TX_PAGES<<8)) { 1514 if (i != (TX_PAGES<<8)) {
1515 iounmap(info->base); 1515 iounmap(info->base);
1516 pcmcia_release_window(link->win); 1516 pcmcia_release_window(link, link->win);
1517 info->base = NULL; link->win = NULL; 1517 info->base = NULL; link->win = NULL;
1518 goto failed; 1518 goto failed;
1519 } 1519 }