From ac064418f466e6c762ad259d9da2b5f8e6a24b09 Mon Sep 17 00:00:00 2001
From: Dominik Brodowski <linux@dominikbrodowski.net>
Date: Mon, 7 Jun 2010 18:31:17 +0200
Subject: [PATCH] --- yaml --- r: 200340 b: refs/heads/master c:
 b83156b52dd77979cc93bafc2283929532f6f7d0 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/pcmcia/ds.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 35a2fed046e3..02064c962314 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 287b87a350de4e344d60697a1f16abe2a6cd350a
+refs/heads/master: b83156b52dd77979cc93bafc2283929532f6f7d0
diff --git a/trunk/drivers/pcmcia/ds.c b/trunk/drivers/pcmcia/ds.c
index 7ef7adee5e4f..9fc339845538 100644
--- a/trunk/drivers/pcmcia/ds.c
+++ b/trunk/drivers/pcmcia/ds.c
@@ -671,6 +671,7 @@ static void pcmcia_requery(struct pcmcia_socket *s)
 		if (old_funcs != new_funcs) {
 			/* we need to re-start */
 			pcmcia_card_remove(s, NULL);
+			s->functions = 0;
 			pcmcia_card_add(s);
 		}
 	}