[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>

authored by Dominik Brodowski and committed by Linus Torvalds 5d546f54 2b8d4669

+1 -1
+1 -1
drivers/pcmcia/ds.c
··· 589 static inline void pcmcia_add_pseudo_device(struct pcmcia_socket *s) 590 { 591 if (!s->pcmcia_state.device_add_pending) { 592 - schedule_work(&s->device_add); 593 s->pcmcia_state.device_add_pending = 1; 594 } 595 return; 596 }
··· 589 static inline void pcmcia_add_pseudo_device(struct pcmcia_socket *s) 590 { 591 if (!s->pcmcia_state.device_add_pending) { 592 s->pcmcia_state.device_add_pending = 1; 593 + schedule_work(&s->device_add); 594 } 595 return; 596 }