aboutsummaryrefslogtreecommitdiff
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-01-16 09:27:33 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-02-21 14:27:04 +0000
commit65c77dcaa4d175194588cc829ccf0f1709f257c5 (patch)
tree14445c7bb2dcc69282074a36b358cd371232d86c /drivers/pcmcia
parent1c3d038bd5fb9dc868bb7474caaddc7aea4d562e (diff)
downloadlinux-65c77dcaa4d175194588cc829ccf0f1709f257c5.tar.gz
PCMCIA: sa1111: pass along sa1111_pcmcia_configure_socket() failure code
Pass along the sa1111_pcmcia_configure_socket() failure code to higher levels, rather than just returning zero. Acked-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r--drivers/pcmcia/sa1100_badge4.c2
-rw-r--r--drivers/pcmcia/sa1100_neponset.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/sa1100_badge4.c b/drivers/pcmcia/sa1100_badge4.c
index ca97cb86389..4d206f4dd67 100644
--- a/drivers/pcmcia/sa1100_badge4.c
+++ b/drivers/pcmcia/sa1100_badge4.c
@@ -122,7 +122,7 @@ badge4_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state
local_irq_restore(flags);
}
- return 0;
+ return ret;
}
static struct pcmcia_low_level badge4_pcmcia_ops = {
diff --git a/drivers/pcmcia/sa1100_neponset.c b/drivers/pcmcia/sa1100_neponset.c
index 1eac3fd60d7..50f297d850e 100644
--- a/drivers/pcmcia/sa1100_neponset.c
+++ b/drivers/pcmcia/sa1100_neponset.c
@@ -103,7 +103,7 @@ neponset_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_sta
sa1111_set_io(s->dev, pa_dwr_mask, pa_dwr_set);
}
- return 0;
+ return ret;
}
static struct pcmcia_low_level neponset_pcmcia_ops = {