2 files changed, 4 insertions, 1 deletions

diff --git a/drivers/pcmcia/cistpl.c b/drivers/pcmcia/cistpl.c
index 4ff725ca2c74..8b3b49217287 100644
--- a/drivers/pcmcia/cistpl.c
+++ b/drivers/pcmcia/cistpl.c
@@ -1386,7 +1386,7 @@ int pccard_validate_cis(struct pcmcia_socket *s, unsigned int *info)
         if (!s)
                 return -EINVAL;
 
-        if (s->functions) {
+        if (s->functions || !(s->state & SOCKET_PRESENT)) {
                 WARN_ON(1);
                 return -EINVAL;
         }
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 757119b87146..d3baf0bfca9f 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -667,6 +667,9 @@ static void pcmcia_requery(struct pcmcia_socket *s)
 {
         int has_pfc;
 
+        if (!(s->state & SOCKET_PRESENT))
+                return;
+
         if (s->functions == 0) {
                 pcmcia_card_add(s);
                 return;