From 7ab24855482fbc47712de46c05726d59cd0748e2 Mon Sep 17 00:00:00 2001 From: Dominik Brodowski Date: Wed, 17 Feb 2010 18:00:07 +0100 Subject: pcmcia: add locking to pcmcia_{read,write}_cis_mem Signed-off-by: Dominik Brodowski --- drivers/pcmcia/rsrc_nonstatic.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'drivers/pcmcia/rsrc_nonstatic.c') 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, { int ret = -EINVAL; + if (s->fake_cis) { + dev_dbg(&s->dev, "fake CIS is being used: can't validate mem\n"); + return 0; + } + s->cis_mem.res = res; s->cis_virt = ioremap(res->start, s->map_size); if (s->cis_virt) { -- cgit v1.2.3