diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2005-08-01 14:55:51 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-01 19:03:56 +0200 |
| commit | 5d546f54324e04747e82ccbb4ea85f54bdcacd6d (patch) | |
| tree | 58b217d83948d56dbb8d874941ad9aca1ab28f45 /drivers/pcmcia/ds.c | |
| parent | [PATCH] pcmcia: defer ide-cs initialization after other IDE drivers started up (diff) | |
| download | linux-5d546f54324e04747e82ccbb4ea85f54bdcacd6d.tar.xz linux-5d546f54324e04747e82ccbb4ea85f54bdcacd6d.zip | |
[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>
Diffstat (limited to 'drivers/pcmcia/ds.c')
| -rw-r--r-- | drivers/pcmcia/ds.c | 2 |
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; } |