From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Mon, 15 Jul 2013 11:15:07 +0000 (+0200)
Subject: bcma: return correct error code when bus scan failed
X-Git-Tag: v3.12-rc1~132^2~297^2^2~97
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cabf7dba57011339d7e5a44b2c9829305936372;p=thirdparty%2Flinux.git

bcma: return correct error code when bus scan failed

It is better to return the actual error code than just -1.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index 0067422ec17da..90ee350442a99 100644
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
@@ -237,7 +237,7 @@ int bcma_bus_register(struct bcma_bus *bus)
 	err = bcma_bus_scan(bus);
 	if (err) {
 		bcma_err(bus, "Failed to scan: %d\n", err);
-		return -1;
+		return err;
 	}
 
 	/* Early init CC core */