summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Ritz <daniel.ritz-ml@swissonline.ch>2007-07-31 11:38:08 +0400
committerGreg Kroah-Hartman <gregkh@suse.de>2007-08-10 01:27:36 +0400
commitab166e04a66c550664ab6b3b3cea03402580d681 (patch)
treea19f0351dea46eccd80c20695ad7aab889f0a773
parent058bfc1cc6700c210024dd9fd391ea8fbbb6c91a (diff)
downloadlinux-ab166e04a66c550664ab6b3b3cea03402580d681.tar.xz
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> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/pcmcia/cs.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index 50cad3a59a6c..1e03bbd32661 100644
--- a/drivers/pcmcia/cs.c
+++ b/drivers/pcmcia/cs.c
@@ -409,6 +409,9 @@ static void socket_shutdown(struct pcmcia_socket *s)
#endif
s->functions = 0;
+ /* give socket some time to power down */
+ msleep(100);
+
s->ops->get_status(s, &status);
if (status & SS_POWERON) {
printk(KERN_ERR "PCMCIA: socket %p: *** DANGER *** unable to remove socket power\n", s);