aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia/fmvj18x_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/fmvj18x_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/fmvj18x_cs.c')
-rw-r--r--drivers/net/pcmcia/fmvj18x_cs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
index fdec5c333a2a..61726c82be46 100644
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
@@ -599,7 +599,7 @@ static int fmvj18x_get_hwinfo(struct pcmcia_device *link, u_char *node_id)
599 } 599 }
600 600
601 iounmap(base); 601 iounmap(base);
602 j = pcmcia_release_window(link->win); 602 j = pcmcia_release_window(link, link->win);
603 return (i != 0x200) ? 0 : -1; 603 return (i != 0x200) ? 0 : -1;
604 604
605} /* fmvj18x_get_hwinfo */ 605} /* fmvj18x_get_hwinfo */
@@ -666,7 +666,7 @@ static void fmvj18x_release(struct pcmcia_device *link)
666 tmp = lp->base; 666 tmp = lp->base;
667 lp->base = NULL; /* set NULL before iounmap */ 667 lp->base = NULL; /* set NULL before iounmap */
668 iounmap(tmp); 668 iounmap(tmp);
669 j = pcmcia_release_window(link->win); 669 j = pcmcia_release_window(link, link->win);
670 } 670 }
671 671
672 pcmcia_disable_device(link); 672 pcmcia_disable_device(link);