Merge /spare/repo/linux-2.6/

1 files changed, 1 insertions, 1 deletions

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;
 }