[PATCH] pcmcia: sa1111: propagate error code

Robert Jarzmik robert.jarzmik at free.fr
Thu Sep 1 13:07:00 PDT 2016


Propagate board initialization return code upwards, so that
pcmcia_probe() can report a failure if occurs down the call chain.

Signed-off-by: Robert Jarzmik <robert.jarzmik at free.fr>
---
 drivers/pcmcia/sa1111_generic.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c
index a1531feb8460..16b382256ace 100644
--- a/drivers/pcmcia/sa1111_generic.c
+++ b/drivers/pcmcia/sa1111_generic.c
@@ -204,18 +204,18 @@ static int pcmcia_probe(struct sa1111_dev *dev)
 	sa1111_writel(PCCR_S0_FLT | PCCR_S1_FLT, base + PCCR);
 
 #ifdef CONFIG_SA1100_BADGE4
-	pcmcia_badge4_init(dev);
+	ret = pcmcia_badge4_init(dev);
 #endif
 #ifdef CONFIG_SA1100_JORNADA720
-	pcmcia_jornada720_init(dev);
+	ret = pcmcia_jornada720_init(dev);
 #endif
 #ifdef CONFIG_ARCH_LUBBOCK
-	pcmcia_lubbock_init(dev);
+	ret = pcmcia_lubbock_init(dev);
 #endif
 #ifdef CONFIG_ASSABET_NEPONSET
-	pcmcia_neponset_init(dev);
+	ret = pcmcia_neponset_init(dev);
 #endif
-	return 0;
+	return ret;
 }
 
 static int pcmcia_remove(struct sa1111_dev *dev)
-- 
2.1.4




More information about the linux-pcmcia mailing list