diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-01-17 21:30:53 +0300 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-02-17 19:48:26 +0300 |
| commit | af461fc1875b6ec18e23b5f670af36c4ed35c84e (patch) | |
| tree | fa09a446c94d533c169b9e28e97c0e8c03d36912 /drivers/pcmcia/cistpl.c | |
| parent | f971dbd5da4e2fbf756d07b938a9c65a9c75178b (diff) | |
| download | linux-af461fc1875b6ec18e23b5f670af36c4ed35c84e.tar.xz | |
pcmcia: delay re-scanning and re-querying of PCMCIA bus
After a CIS update -- or the finalization of the resource database --,
proceed with the re-scanning or re-querying of PCMCIA cards only in
a separate thread to avoid deadlocks.
Tested-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/cistpl.c')
| -rw-r--r-- | drivers/pcmcia/cistpl.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/pcmcia/cistpl.c b/drivers/pcmcia/cistpl.c index 14de287a8bf6..17a5da32cce1 100644 --- a/drivers/pcmcia/cistpl.c +++ b/drivers/pcmcia/cistpl.c @@ -1670,15 +1670,7 @@ static ssize_t pccard_store_cis(struct kobject *kobj, if (error) return -EIO; - mutex_lock(&s->skt_mutex); - if ((s->callback) && (s->state & SOCKET_PRESENT) && - !(s->state & SOCKET_CARDBUS)) { - if (try_module_get(s->callback->owner)) { - s->callback->requery(s, 1); - module_put(s->callback->owner); - } - } - mutex_unlock(&s->skt_mutex); + pcmcia_parse_uevents(s, PCMCIA_UEVENT_REQUERY); return count; } |