projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
bcma
/
main.c
diff --git
a/drivers/bcma/main.c
b/drivers/bcma/main.c
index 0067422ec17dacb681fd3d6cd4afd0c64894ae1c..90ee350442a99d243606c97b716af75d909308c9 100644
(file)
--- 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 */