PCMCIA: sa1111: pass along sa1111_pcmcia_configure_socket() failure code
Russell King [Mon, 16 Jan 2012 09:27:33 +0000 (09:27 +0000)]
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>

drivers/pcmcia/sa1100_badge4.c
drivers/pcmcia/sa1100_neponset.c

index ca97cb8..4d206f4 100644 (file)
@@ -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 = {
index 1eac3fd..50f297d 100644 (file)
@@ -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 = {