aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/cs.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pcmcia/cs.c')
-rw-r--r--drivers/pcmcia/cs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index 1c6c8c8f57c9..48386f31e610 100644
--- a/drivers/pcmcia/cs.c
+++ b/drivers/pcmcia/cs.c
@@ -451,7 +451,7 @@ static int socket_setup(struct pcmcia_socket *skt, int initial_delay)
451 if (status & SS_CARDBUS) { 451 if (status & SS_CARDBUS) {
452 if (!(skt->features & SS_CAP_CARDBUS)) { 452 if (!(skt->features & SS_CAP_CARDBUS)) {
453 cs_err(skt, "cardbus cards are not supported.\n"); 453 cs_err(skt, "cardbus cards are not supported.\n");
454 return CS_BAD_TYPE; 454 return -EINVAL;
455 } 455 }
456 skt->state |= SOCKET_CARDBUS; 456 skt->state |= SOCKET_CARDBUS;
457 } 457 }
@@ -465,7 +465,7 @@ static int socket_setup(struct pcmcia_socket *skt, int initial_delay)
465 skt->socket.Vcc = skt->socket.Vpp = 50; 465 skt->socket.Vcc = skt->socket.Vpp = 50;
466 else { 466 else {
467 cs_err(skt, "unsupported voltage key.\n"); 467 cs_err(skt, "unsupported voltage key.\n");
468 return CS_BAD_TYPE; 468 return -EIO;
469 } 469 }
470 470
471 if (skt->power_hook) 471 if (skt->power_hook)
@@ -482,7 +482,7 @@ static int socket_setup(struct pcmcia_socket *skt, int initial_delay)
482 skt->ops->get_status(skt, &status); 482 skt->ops->get_status(skt, &status);
483 if (!(status & SS_POWERON)) { 483 if (!(status & SS_POWERON)) {
484 cs_err(skt, "unable to apply power.\n"); 484 cs_err(skt, "unable to apply power.\n");
485 return CS_BAD_TYPE; 485 return -EIO;
486 } 486 }
487 487
488 status = socket_reset(skt); 488 status = socket_reset(skt);