39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
|
From e0c3678ae640db049f738f30b5f23cde740799ac Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
|
||
|
|
Date: Wed, 1 Apr 2015 16:01:02 +0200
|
||
|
|
Subject: [PATCH] MIPS: BCM47XX: Fix detecting Microsoft MN-700 & Asus WL500G
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
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>
|
||
|
|
---
|
||
|
|
arch/mips/bcm47xx/board.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/arch/mips/bcm47xx/board.c b/arch/mips/bcm47xx/board.c
|
||
|
|
index b3ae068..3fd369d 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)
|
||
|
|
}
|
||
|
|
|
||
|
|
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;
|
||
|
|
--
|
||
|
|
1.8.4.5
|
||
|
|
|