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;