summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2011-12-11 16:11:41 +0100
committerRalf Baechle <ralf@linux-mips.org>2012-02-20 18:33:19 +0100
commit87b43457f896975ba2aca1a611c018b3429a7b19 (patch)
tree16e60b58305d10860ad50c67000021366da41dd5 /arch
parentf79eaeb108499e10fa604103737e7273404e76a4 (diff)
downloadblackbird-op-linux-87b43457f896975ba2aca1a611c018b3429a7b19.tar.gz
blackbird-op-linux-87b43457f896975ba2aca1a611c018b3429a7b19.zip
MIPS: ATH79: Avoid a kernel bug on AR913X
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/ath79/dev-wmac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/ath79/dev-wmac.c b/arch/mips/ath79/dev-wmac.c
index 24f546985b69..e21507052066 100644
--- 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();
OpenPOWER on IntegriCloud