aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-04-30 12:26:01 -0400
committerArnd Bergmann <arnd@arndb.de>2012-10-07 04:33:09 -0400
commit5f07809e93b4c05516d85a3f2770b1a77115eb70 (patch)
treee64dc5192285bd085ce05d371ca913ba4b69bedc
parent5063557ac0e83a52182fd0d49e83cc770e52ccd1 (diff)
ARM: rpc: check device_register return code in ecard_probe
device_register is marked __must_check, so we better propagate the error value by returning it from ecard_probe. Without this patch, building rpc_defconfig results in: arch/arm/mach-rpc/ecard.c: In function 'ecard_probe': arch/arm/mach-rpc/ecard.c:963:17: warning: ignoring return value of 'device_register', declared with attribute warn_unused_result [-Wunused-result] Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-rpc/ecard.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-rpc/ecard.c b/arch/arm/mach-rpc/ecard.c
index b91bc87b3dcf..fcb1d59f7aec 100644
--- a/arch/arm/mach-rpc/ecard.c
+++ b/arch/arm/mach-rpc/ecard.c
@@ -960,7 +960,9 @@ static int __init ecard_probe(int slot, unsigned irq, card_type_t type)
960 *ecp = ec; 960 *ecp = ec;
961 slot_to_expcard[slot] = ec; 961 slot_to_expcard[slot] = ec;
962 962
963 device_register(&ec->dev); 963 rc = device_register(&ec->dev);
964 if (rc)
965 goto nodev;
964 966
965 return 0; 967 return 0;
966 968