[PATCH] PCMCIA: prevent auto insert during resume.
- From: Rodolfo Giometti <giometti@xxxxxxxxxxxx>
- Date: Fri, 26 Oct 2007 12:51:25 +0200
If a socket has been ejected before sleeping, at resume time it
shouldn't be awaked.
Signed-off-by: Rodolfo Giometti <giometti@xxxxxxxx>
---
drivers/pcmcia/cs.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index 729e37d..d69de74 100644
--- a/drivers/pcmcia/cs.c
+++ b/drivers/pcmcia/cs.c
@@ -562,10 +562,8 @@ static int socket_resume(struct pcmcia_socket *skt)
skt->ops->init(skt);
skt->ops->set_socket(skt, &skt->socket);
- if (!(skt->state & SOCKET_PRESENT)) {
- skt->state &= ~SOCKET_SUSPEND;
- return socket_insert(skt);
- }
+ if (!(skt->state & SOCKET_PRESENT))
+ goto resume_exit;
ret = socket_setup(skt, SS_COMA, resume_delay);
if (ret == CS_SUCCESS) {
@@ -599,6 +597,7 @@ static int socket_resume(struct pcmcia_socket *skt)
socket_shutdown(skt);
}
+resume_exit:
skt->state &= ~SOCKET_SUSPEND;
return CS_SUCCESS;
--
1.5.2.5
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
- Follow-Ups:
- Re: [PATCH] PCMCIA: prevent auto insert during resume.
- From: Russell King
- Re: [PATCH] PCMCIA: prevent auto insert during resume.
- Prev by Date: Re: [PATCH 1/?] Unlock when sn_oemdata can't be extended
- Next by Date: Re: LSM conversion to static interface
- Previous by thread: Re: Distributed storage. Move away from char device ioctls.
- Next by thread: Re: [PATCH] PCMCIA: prevent auto insert during resume.
- Index(es):
Relevant Pages
|
|
