aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2015-04-01 10:01:02 -0400
committerRalf Baechle <ralf@linux-mips.org>2015-04-10 09:41:54 -0400
commit96f7c21363e0e0d19f3471f54a719ed06d708513 (patch)
tree97c8d5fbe429cb5bd7b8af823b99d440cbcd350d /arch/mips
parent6ca716f2e5571d25a3899c6c5c91ff72ea6d6f5e (diff)
MIPS: BCM47XX: Fix detecting Microsoft MN-700 & Asus WL500G
Since the day of adding this code it was broken. We were iterating over a wrong array and checking for wrong NVRAM entry. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Cc: linux-mips@linux-mips.org Cc: Hauke Mehrtens <hauke@hauke-m.de> Patchwork: https://patchwork.linux-mips.org/patch/9654/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/bcm47xx/board.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/bcm47xx/board.c b/arch/mips/bcm47xx/board.c
index b3ae068ca4fa..3fd369d74444 100644
--- a/arch/mips/bcm47xx/board.c
+++ b/arch/mips/bcm47xx/board.c
@@ -247,8 +247,8 @@ static __init const struct bcm47xx_board_type *bcm47xx_board_get_nvram(void)
247 } 247 }
248 248
249 if (bcm47xx_nvram_getenv("hardware_version", buf1, sizeof(buf1)) >= 0 && 249 if (bcm47xx_nvram_getenv("hardware_version", buf1, sizeof(buf1)) >= 0 &&
250 bcm47xx_nvram_getenv("boardtype", buf2, sizeof(buf2)) >= 0) { 250 bcm47xx_nvram_getenv("boardnum", buf2, sizeof(buf2)) >= 0) {
251 for (e2 = bcm47xx_board_list_boot_hw; e2->value1; e2++) { 251 for (e2 = bcm47xx_board_list_hw_version_num; e2->value1; e2++) {
252 if (!strstarts(buf1, e2->value1) && 252 if (!strstarts(buf1, e2->value1) &&
253 !strcmp(buf2, e2->value2)) 253 !strcmp(buf2, e2->value2))
254 return &e2->board; 254 return &e2->board;