projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f79eaeb
)
MIPS: ATH79: Avoid a kernel bug on AR913X
author
Gabor Juhos
<juhosg@openwrt.org>
Sun, 11 Dec 2011 15:11:41 +0000
(16:11 +0100)
committer
Ralf Baechle
<ralf@linux-mips.org>
Mon, 20 Feb 2012 17:33:19 +0000
(18:33 +0100)
Wireless mac registration causes a BUG on AR913X SoCs due to
a missing 'else'.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3182/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/ath79/dev-wmac.c
patch
|
blob
|
history
diff --git
a/arch/mips/ath79/dev-wmac.c
b/arch/mips/ath79/dev-wmac.c
index
24f5469
..
e215070
100644
(file)
--- a/
arch/mips/ath79/dev-wmac.c
+++ b/
arch/mips/ath79/dev-wmac.c
@@
-96,7
+96,7
@@
void __init ath79_register_wmac(u8 *cal_data)
{
if (soc_is_ar913x())
ar913x_wmac_setup();
- if (soc_is_ar933x())
+
else
if (soc_is_ar933x())
ar933x_wmac_setup();
else
BUG();