diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-02-17 18:00:07 +0100 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-02-17 18:00:07 +0100 |
| commit | 7ab24855482fbc47712de46c05726d59cd0748e2 (patch) | |
| tree | 0a2dfc014cd620eb6f9bdbc46ee58d63618a42ea /drivers/pcmcia/rsrc_nonstatic.c | |
| parent | 44961a03adbf16d872f0b83ec848d0759516d33f (diff) | |
| download | linux-0-day-7ab24855482fbc47712de46c05726d59cd0748e2.tar.gz linux-0-day-7ab24855482fbc47712de46c05726d59cd0748e2.tar.xz | |
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 c13424f7b479c..19cecb5397597 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) { |