diff options
Diffstat (limited to 'drivers/pcmcia/cistpl.c')
-rw-r--r-- | drivers/pcmcia/cistpl.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/pcmcia/cistpl.c b/drivers/pcmcia/cistpl.c index ba4a5acc2e9a..1733fab469a1 100644 --- a/drivers/pcmcia/cistpl.c +++ b/drivers/pcmcia/cistpl.c | |||
@@ -209,7 +209,7 @@ int pcmcia_read_cis_mem(struct pcmcia_socket *s, int attr, u_int addr, | |||
209 | * Probably only useful for writing one-byte registers. Must be called | 209 | * Probably only useful for writing one-byte registers. Must be called |
210 | * with ops_mutex held. | 210 | * with ops_mutex held. |
211 | */ | 211 | */ |
212 | void pcmcia_write_cis_mem(struct pcmcia_socket *s, int attr, u_int addr, | 212 | int pcmcia_write_cis_mem(struct pcmcia_socket *s, int attr, u_int addr, |
213 | u_int len, void *ptr) | 213 | u_int len, void *ptr) |
214 | { | 214 | { |
215 | void __iomem *sys, *end; | 215 | void __iomem *sys, *end; |
@@ -231,7 +231,7 @@ void pcmcia_write_cis_mem(struct pcmcia_socket *s, int attr, u_int addr, | |||
231 | ((cis_width) ? MAP_16BIT : 0)); | 231 | ((cis_width) ? MAP_16BIT : 0)); |
232 | if (!sys) { | 232 | if (!sys) { |
233 | dev_dbg(&s->dev, "could not map memory\n"); | 233 | dev_dbg(&s->dev, "could not map memory\n"); |
234 | return; /* FIXME: Error */ | 234 | return -EINVAL; |
235 | } | 235 | } |
236 | 236 | ||
237 | writeb(flags, sys+CISREG_ICTRL0); | 237 | writeb(flags, sys+CISREG_ICTRL0); |
@@ -256,7 +256,7 @@ void pcmcia_write_cis_mem(struct pcmcia_socket *s, int attr, u_int addr, | |||
256 | sys = set_cis_map(s, card_offset, flags); | 256 | sys = set_cis_map(s, card_offset, flags); |
257 | if (!sys) { | 257 | if (!sys) { |
258 | dev_dbg(&s->dev, "could not map memory\n"); | 258 | dev_dbg(&s->dev, "could not map memory\n"); |
259 | return; /* FIXME: error */ | 259 | return -EINVAL; |
260 | } | 260 | } |
261 | 261 | ||
262 | end = sys + s->map_size; | 262 | end = sys + s->map_size; |
@@ -270,6 +270,7 @@ void pcmcia_write_cis_mem(struct pcmcia_socket *s, int attr, u_int addr, | |||
270 | addr = 0; | 270 | addr = 0; |
271 | } | 271 | } |
272 | } | 272 | } |
273 | return 0; | ||
273 | } | 274 | } |
274 | 275 | ||
275 | 276 | ||