MIPS: BCM47XX: Fix detecting Microsoft MN-700 & Asus WL500G

[ Upstream commit 96f7c21363e0e0d19f3471f54a719ed06d708513 ]

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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>

diff --git a/arch/mips/bcm47xx/board.c b/arch/mips/bcm47xx/board.c
index b3ae068ca4fa67956723d223358ea358c771a675..3fd369d74444ebe165ba74f95ad9ed51aa6e7274 100644 (file)
--- 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)
        }
 
        if (bcm47xx_nvram_getenv("hardware_version", buf1, sizeof(buf1)) >= 0 &&
-           bcm47xx_nvram_getenv("boardtype", buf2, sizeof(buf2)) >= 0) {
-               for (e2 = bcm47xx_board_list_boot_hw; e2->value1; e2++) {
+           bcm47xx_nvram_getenv("boardnum", buf2, sizeof(buf2)) >= 0) {
+               for (e2 = bcm47xx_board_list_hw_version_num; e2->value1; e2++) {
                        if (!strstarts(buf1, e2->value1) &&
                            !strcmp(buf2, e2->value2))
                                return &e2->board;