diff options
author | Magnus Damm <damm@opensource.se> | 2006-12-13 05:46:43 -0500 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2009-11-28 12:02:13 -0500 |
commit | 868575d1e87ff2091800aea816972ddb46de60d5 (patch) | |
tree | 95c50968098815dfe066e960922c4be3b003b27f /drivers/char/pcmcia/ipwireless/main.c | |
parent | f5560da549ea2e32dd41e36548c0e7dee3d4aabb (diff) |
pcmcia: Pass struct pcmcia_device to pcmcia_map_mem_page()
No logic changes, just pass struct pcmcia_device to pcmcia_map_mem_page()
[linux@dominikbrodowski.net: update to 2.6.31]
CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: linux-scsi@vger.kernel.org
CC: Jiri Kosina <jkosina@suse.cz>
Acked-by: Karsten Keil <keil@b1-systems.de> (for ISDN)
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/char/pcmcia/ipwireless/main.c')
-rw-r--r-- | drivers/char/pcmcia/ipwireless/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/pcmcia/ipwireless/main.c b/drivers/char/pcmcia/ipwireless/main.c index 91ca23d2b042..10af1c0dc368 100644 --- a/drivers/char/pcmcia/ipwireless/main.c +++ b/drivers/char/pcmcia/ipwireless/main.c | |||
@@ -125,7 +125,7 @@ static int ipwireless_probe(struct pcmcia_device *p_dev, | |||
125 | memreq_common_memory.CardOffset = cfg->mem.win[0].card_addr; | 125 | memreq_common_memory.CardOffset = cfg->mem.win[0].card_addr; |
126 | memreq_common_memory.Page = 0; | 126 | memreq_common_memory.Page = 0; |
127 | 127 | ||
128 | ret = pcmcia_map_mem_page(ipw->handle_common_memory, | 128 | ret = pcmcia_map_mem_page(p_dev, ipw->handle_common_memory, |
129 | &memreq_common_memory); | 129 | &memreq_common_memory); |
130 | 130 | ||
131 | if (ret != 0) | 131 | if (ret != 0) |
@@ -154,7 +154,7 @@ static int ipwireless_probe(struct pcmcia_device *p_dev, | |||
154 | memreq_attr_memory.CardOffset = 0; | 154 | memreq_attr_memory.CardOffset = 0; |
155 | memreq_attr_memory.Page = 0; | 155 | memreq_attr_memory.Page = 0; |
156 | 156 | ||
157 | ret = pcmcia_map_mem_page(ipw->handle_attr_memory, | 157 | ret = pcmcia_map_mem_page(p_dev, ipw->handle_attr_memory, |
158 | &memreq_attr_memory); | 158 | &memreq_attr_memory); |
159 | 159 | ||
160 | if (ret != 0) | 160 | if (ret != 0) |