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>

diff --git a/drivers/pcmcia/sa1100_badge4.c b/drivers/pcmcia/sa1100_badge4.c
index ca97cb863896e79e735e1aa890656b9ca1730fdd..4d206f4dd67ba339d437d0b51b96a08da8d592f7 100644 (file)
--- 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 1eac3fd60d73f34cb85fa4ff3b36f1a8b3bbfbfc..50f297d850e752a57c825d0fd9dbdb238a301bd3 100644 (file)
--- 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 = {