From: linux@arm•linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 15/19] PCMCIA: sa1111: pass along sa1111_pcmcia_configure_socket() failure code
Date: Fri, 20 Jan 2012 10:22:14 +0000 [thread overview]
Message-ID: <E1RoBbq-0005iQ-R7@rmk-PC.arm.linux.org.uk> (raw)
In-Reply-To: <20120120101709.GE1068@n2100.arm.linux.org.uk>
Pass along the sa1111_pcmcia_configure_socket() failure code to
higher levels, rather than just returning zero.
Signed-off-by: Russell King <rmk+kernel@arm•linux.org.uk>
---
drivers/pcmcia/sa1100_badge4.c | 2 +-
drivers/pcmcia/sa1100_neponset.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/pcmcia/sa1100_badge4.c b/drivers/pcmcia/sa1100_badge4.c
index ca97cb8..4d206f4 100644
--- a/drivers/pcmcia/sa1100_badge4.c
+++ b/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/drivers/pcmcia/sa1100_neponset.c b/drivers/pcmcia/sa1100_neponset.c
index 1eac3fd..50f297d 100644
--- a/drivers/pcmcia/sa1100_neponset.c
+++ b/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 = {
--
1.7.4.4
next prev parent reply other threads:[~2012-01-20 10:22 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-20 10:17 [PATCH 00/19] ARM SA11x0 / PXA / SoC-common PCMCIA cleanups Russell King - ARM Linux
2012-01-20 10:17 ` [PATCH 01/19] PCMCIA: soc_common: move common initialization into soc_common Russell King - ARM Linux
2012-01-20 10:17 ` [PATCH 02/19] PCMCIA: soc_common: add GPIO support for card status signals Russell King - ARM Linux
2012-01-20 10:18 ` [PATCH 03/19] PCMCIA: pxa: convert PXA socket drivers to use new irq/gpio management Russell King - ARM Linux
2012-01-20 10:18 ` [PATCH 04/19] PCMCIA: sa1111: use new per-socket irq/gpio infrastructure Russell King - ARM Linux
2012-01-20 10:18 ` [PATCH 05/19] PCMCIA: sa11x0: assabet: convert to use new irq/gpio management Russell King - ARM Linux
2012-01-20 10:19 ` [PATCH 06/19] PCMCIA: sa11x0: cerf: " Russell King - ARM Linux
2012-01-20 10:19 ` [PATCH 07/19] PCMCIA: sa11x0: cerf: convert reset handling to use GPIO subsystem Russell King - ARM Linux
2012-01-20 10:19 ` [PATCH 08/19] PCMCIA: sa11x0: nanoengine: convert to use new irq/gpio management Russell King - ARM Linux
2012-01-20 10:20 ` [PATCH 09/19] PCMCIA: sa11x0: nanoengine: convert reset handling to use GPIO subsystem Russell King - ARM Linux
2012-01-20 10:20 ` [PATCH 10/19] PCMCIA: sa11x0: shannon: convert to use new irq/gpio management Russell King - ARM Linux
2012-01-20 10:20 ` [PATCH 11/19] PCMCIA: sa11x0: simpad: " Russell King - ARM Linux
2012-01-20 10:21 ` [PATCH 12/19] PCMCIA: sa11x0: h3600: " Russell King - ARM Linux
2012-01-20 10:21 ` [PATCH 13/19] PCMCIA: soc_common: remove soc_pcmcia_*_irqs functions Russell King - ARM Linux
2012-01-20 10:21 ` [PATCH 14/19] PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers Russell King - ARM Linux
2012-01-20 10:22 ` Russell King - ARM Linux [this message]
2012-01-20 10:22 ` [PATCH 16/19] PCMCIA: sa1111: jornada720: no need to disable IRQs around sa1111_set_io Russell King - ARM Linux
2012-01-20 10:22 ` [PATCH 17/19] PCMCIA: Add Kconfig control for building sa11xx_base.c Russell King - ARM Linux
2012-01-20 10:23 ` [PATCH 18/19] PCMCIA: make lubbock socket driver part of sa1111_cs Russell King - ARM Linux
2012-01-20 10:23 ` [PATCH 19/19] PCMCIA: sa1111: rename sa1111 socket drivers to have sa1111_ prefix Russell King - ARM Linux
2012-01-20 10:39 ` [PATCH 00/19] ARM SA11x0 / PXA / SoC-common PCMCIA cleanups Russell King - ARM Linux
2012-01-25 19:40 ` Dominik Brodowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1RoBbq-0005iQ-R7@rmk-PC.arm.linux.org.uk \
--to=linux@arm$(echo .)linux.org.uk \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox