The patch titled
pcmcia: give socket time to power down
has been added to the -mm tree. Its filename is
pcmcia-give-socket-time-to-power-down.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: pcmcia: give socket time to power down
From: Daniel Ritz <daniel.ritz-ml@xxxxxxxxxxxxxx>
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).
Also remove the totally pointless shutdown_delay module parameter.
Signed-off-by: Daniel Ritz <daniel.ritz@xxxxxx>
Cc: Nils Neumann <nils.neumann@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/pcmcia/cs.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff -puN drivers/pcmcia/cs.c~pcmcia-give-socket-time-to-power-down drivers/pcmcia/cs.c
--- a/drivers/pcmcia/cs.c~pcmcia-give-socket-time-to-power-down
+++ a/drivers/pcmcia/cs.c
@@ -53,7 +53,6 @@ MODULE_LICENSE("GPL");
INT_MODULE_PARM(setup_delay, 10); /* centiseconds */
INT_MODULE_PARM(resume_delay, 20); /* centiseconds */
-INT_MODULE_PARM(shutdown_delay, 3); /* centiseconds */
INT_MODULE_PARM(vcc_settle, 40); /* centiseconds */
INT_MODULE_PARM(reset_time, 10); /* usecs */
INT_MODULE_PARM(unreset_delay, 10); /* centiseconds */
@@ -393,8 +392,6 @@ static void socket_shutdown(struct pcmci
cs_dbg(s, 4, "shutdown\n");
socket_remove_drivers(s);
- s->state &= SOCKET_INUSE | SOCKET_PRESENT;
- msleep(shutdown_delay * 10);
s->state &= SOCKET_INUSE;
/* Blank out the socket state */
@@ -409,6 +406,9 @@ static void socket_shutdown(struct pcmci
#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);
_
Patches currently in -mm which might be from daniel.ritz-ml@xxxxxxxxxxxxxx are
pcmcia-give-socket-time-to-power-down.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
