ChangeSet 1.2231.1.166, 2005/03/28 20:02:36-08:00, [EMAIL PROTECTED]
[PATCH] Fix PCMCIA resume with card inserted
The following patch fixes a minor but annoying issue with PCMCIA resume.
When a machine is suspended with an empty socket, and then resumed with
a
card in the socket, the card is ignored. The following patch adjusts
the
resume paths such that we detect the card and properly initialise it.
Signed-off-by: Russell King <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
cs.c | 5 +++++
1 files changed, 5 insertions(+)
diff -Nru a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
--- a/drivers/pcmcia/cs.c 2005-03-28 21:43:08 -08:00
+++ b/drivers/pcmcia/cs.c 2005-03-28 21:43:08 -08:00
@@ -587,6 +587,11 @@
skt->ops->init(skt);
skt->ops->set_socket(skt, &skt->socket);
+ if (!(skt->state & SOCKET_PRESENT)) {
+ skt->state &= ~SOCKET_SUSPEND;
+ return socket_insert(skt);
+ }
+
ret = socket_setup(skt, resume_delay);
if (ret == CS_SUCCESS) {
/*
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
