diff options
| author |   Dominik Brodowski <linux@dominikbrodowski.net> | 2010-01-06 13:57:43 +0100 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-02-17 17:37:30 +0100 |
| commit | 6e7b51a733fde86d3be748543215a69da04d5bb7 (patch) | |
| tree | 4c608cf607ef1bb69231f4c67d45a9ac9429e650 /drivers/pcmcia/rsrc_nonstatic.c | |
| parent | pcmcia: m8xx_pcmcia.c should use iodyn resource manager (diff) | |
| download | linux-dev-6e7b51a733fde86d3be748543215a69da04d5bb7.tar.xz linux-dev-6e7b51a733fde86d3be748543215a69da04d5bb7.zip | |
pcmcia: move cistpl.c into pcmcia module
As PCMCIA is the only real user of CIS access functions, include
cistpl.c in the PCMCIA module, not in the PCMCIA & CardBus core
module.
Tested-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/rsrc_nonstatic.c')
| -rw-r--r-- | drivers/pcmcia/rsrc_nonstatic.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c index 120d5ad99296..91626c17f97b 100644 --- a/drivers/pcmcia/rsrc_nonstatic.c +++ b/drivers/pcmcia/rsrc_nonstatic.c @@ -277,7 +277,9 @@ static int readable(struct pcmcia_socket *s, struct resource *res, s->cis_mem.res = res; s->cis_virt = ioremap(res->start, s->map_size); if (s->cis_virt) { - ret = pccard_validate_cis(s, count); + /* as we're only called from pcmcia.c, we're safe */ + if (s->callback->validate) + ret = s->callback->validate(s, count); /* invalidate mapping */ iounmap(s->cis_virt); s->cis_virt = NULL; |