From f14d13d8688e2a169e17cc2155bc748660b87f63 Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 16 Jan 2012 09:27:33 +0000 Subject: [PATCH] --- yaml --- r: 295408 b: refs/heads/master c: 65c77dcaa4d175194588cc829ccf0f1709f257c5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pcmcia/sa1100_badge4.c | 2 +- trunk/drivers/pcmcia/sa1100_neponset.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5fddcd426a16..2071d4fd3e0d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1c3d038bd5fb9dc868bb7474caaddc7aea4d562e +refs/heads/master: 65c77dcaa4d175194588cc829ccf0f1709f257c5 diff --git a/trunk/drivers/pcmcia/sa1100_badge4.c b/trunk/drivers/pcmcia/sa1100_badge4.c index ca97cb863896..4d206f4dd67b 100644 --- a/trunk/drivers/pcmcia/sa1100_badge4.c +++ b/trunk/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/trunk/drivers/pcmcia/sa1100_neponset.c b/trunk/drivers/pcmcia/sa1100_neponset.c index 1eac3fd60d73..50f297d850e7 100644 --- a/trunk/drivers/pcmcia/sa1100_neponset.c +++ b/trunk/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 = {