[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1472760420-18272-1-git-send-email-robert.jarzmik@free.fr>
Date: Thu, 1 Sep 2016 22:07:00 +0200
From: Robert Jarzmik <robert.jarzmik@...e.fr>
To: Russell King - ARM Linux <linux@....linux.org.uk>
Cc: linux-pcmcia@...ts.infradead.org, linux-kernel@...r.kernel.org,
Robert Jarzmik <robert.jarzmik@...e.fr>
Subject: [PATCH] pcmcia: sa1111: propagate error code
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@...e.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
Powered by blists - more mailing lists