summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/cs.c
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2008-08-03 11:15:45 +0200
committerDominik Brodowski <linux@dominikbrodowski.net>2008-08-23 02:29:44 +0200
commit8567142e87322141f9344d1ab632ccf5190cd0d3 (patch)
treec97d0ceead6690580b7a595a5b7dc7113a6c37f6 /drivers/pcmcia/cs.c
parent3939c1ef1f954409d1441c09fbc08376655758fe (diff)
downloadop-kernel-dev-8567142e87322141f9344d1ab632ccf5190cd0d3.zip
op-kernel-dev-8567142e87322141f9344d1ab632ccf5190cd0d3.tar.gz
pcmcia: deprecate CS_GENERAL_FAILURE
It's only used by pcmcia_core when socket-related queries time out. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/cs.c')
-rw-r--r--drivers/pcmcia/cs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index 15a1203..f942480 100644
--- a/drivers/pcmcia/cs.c
+++ b/drivers/pcmcia/cs.c
@@ -376,7 +376,7 @@ static int socket_reset(struct pcmcia_socket *skt)
}
cs_err(skt, "time out after reset.\n");
- return CS_GENERAL_FAILURE;
+ return -ETIMEDOUT;
}
/*
@@ -445,7 +445,7 @@ static int socket_setup(struct pcmcia_socket *skt, int initial_delay)
if (status & SS_PENDING) {
cs_err(skt, "voltage interrogation timed out.\n");
- return CS_GENERAL_FAILURE;
+ return -ETIMEDOUT;
}
if (status & SS_CARDBUS) {
OpenPOWER on IntegriCloud