From: Dominik Brodowski <linux@dominikbrodowski.net>
Date: Mon, 1 Aug 2005 12:55:51 +0000 (+0200)
Subject: [PATCH] pcmcia: fix multiple insertion of multifunction cards
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5d546f54324e04747e82ccbb4ea85f54bdcacd6d;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

[PATCH] pcmcia: fix multiple insertion of multifunction cards

The ordering of setting and clearing device_add_pending went wrong on some
occasions, causing multifunction cards only to be handled correctly on the
first insertion, not on subsequent ones.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index d63f22a5bf7e..43da2e92d50f 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -589,8 +589,8 @@ static void pcmcia_delayed_add_pseudo_device(void *data)
 static inline void pcmcia_add_pseudo_device(struct pcmcia_socket *s)
 {
 	if (!s->pcmcia_state.device_add_pending) {
-		schedule_work(&s->device_add);
 		s->pcmcia_state.device_add_pending = 1;
+		schedule_work(&s->device_add);
 	}
 	return;
 }