diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-02-17 12:00:07 -0500 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-02-17 12:00:07 -0500 |
commit | 7ab24855482fbc47712de46c05726d59cd0748e2 (patch) | |
tree | 0a2dfc014cd620eb6f9bdbc46ee58d63618a42ea /drivers/pcmcia/rsrc_nonstatic.c | |
parent | 44961a03adbf16d872f0b83ec848d0759516d33f (diff) |
pcmcia: add locking to pcmcia_{read,write}_cis_mem
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/rsrc_nonstatic.c')
-rw-r--r-- | drivers/pcmcia/rsrc_nonstatic.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c index c13424f7b479..19cecb539759 100644 --- a/drivers/pcmcia/rsrc_nonstatic.c +++ b/drivers/pcmcia/rsrc_nonstatic.c | |||
@@ -273,6 +273,11 @@ static int readable(struct pcmcia_socket *s, struct resource *res, | |||
273 | { | 273 | { |
274 | int ret = -EINVAL; | 274 | int ret = -EINVAL; |
275 | 275 | ||
276 | if (s->fake_cis) { | ||
277 | dev_dbg(&s->dev, "fake CIS is being used: can't validate mem\n"); | ||
278 | return 0; | ||
279 | } | ||
280 | |||
276 | s->cis_mem.res = res; | 281 | s->cis_mem.res = res; |
277 | s->cis_virt = ioremap(res->start, s->map_size); | 282 | s->cis_virt = ioremap(res->start, s->map_size); |
278 | if (s->cis_virt) { | 283 | if (s->cis_virt) { |