pcmcia: validate CIS, not CIS cache.

In pccard_validate_cis(), validate the card CIS, not the CIS cache.
Also, destroy the CIS cache if pccard_validate_cis fails.

Furthermore, do not remove the fake CIS in destroy_cis_cache() but
do so explicitely in the code paths where it makes sense.

Tested-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index 6d6f82b38a68..96d8d25c209d 100644
--- a/drivers/pcmcia/cs.c
+++ b/drivers/pcmcia/cs.c
@@ -407,6 +407,8 @@ static void socket_shutdown(struct pcmcia_socket *s)
         s->irq.AssignedIRQ = s->irq.Config = 0;
         s->lock_count = 0;
         destroy_cis_cache(s);
+        kfree(s->fake_cis);
+        s->fake_cis = NULL;
 #ifdef CONFIG_CARDBUS
         cb_free(s);
 #endif
@@ -577,6 +579,8 @@ static int socket_late_resume(struct pcmcia_socket *skt)
                         dev_dbg(&skt->dev, "cis mismatch - different card\n");
                         socket_remove_drivers(skt);
                         destroy_cis_cache(skt);
+                        kfree(skt->fake_cis);
+                        skt->fake_cis = NULL;
                         /*
                          * Workaround: give DS time to schedule removal.
                          * Remove me once the 100ms delay is eliminated