diff options
author | Daniel Ritz <daniel.ritz-ml@swissonline.ch> | 2007-07-31 03:38:08 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-31 18:39:38 -0400 |
commit | afb2c1650b4c6f285596268d0a1de2a81542a765 (patch) | |
tree | 82ead1b7165e7246d1b419e35abd365818b513bc | |
parent | 5b232ecfd9ac55adb237e78482ed8f3d3becb0d8 (diff) |
pcmcia: give socket time to power down
Give sockets up to 100ms of additional time to power down. otherwise we
might generate false warnings with KERN_ERR priority (like in bug #8262).
Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch>
Cc: Nils Neumann <nils.neumann@rwth-aachen.de>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/pcmcia/cs.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c index 7c93a108f9b8..f8b13f0270d7 100644 --- a/drivers/pcmcia/cs.c +++ b/drivers/pcmcia/cs.c | |||
@@ -409,6 +409,9 @@ static void socket_shutdown(struct pcmcia_socket *s) | |||
409 | #endif | 409 | #endif |
410 | s->functions = 0; | 410 | s->functions = 0; |
411 | 411 | ||
412 | /* give socket some time to power down */ | ||
413 | msleep(100); | ||
414 | |||
412 | s->ops->get_status(s, &status); | 415 | s->ops->get_status(s, &status); |
413 | if (status & SS_POWERON) { | 416 | if (status & SS_POWERON) { |
414 | printk(KERN_ERR "PCMCIA: socket %p: *** DANGER *** unable to remove socket power\n", s); | 417 | printk(KERN_ERR "PCMCIA: socket %p: *** DANGER *** unable to remove socket power\n", s); |