Browse Source

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>
Russell King 13 years ago
parent
commit
65c77dcaa4
2 changed files with 2 additions and 2 deletions
  1. 1 1
      drivers/pcmcia/sa1100_badge4.c
  2. 1 1
      drivers/pcmcia/sa1100_neponset.c

+ 1 - 1
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 = {

+ 1 - 1
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 = {