diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-11-16 03:11:09 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-11-16 03:11:09 +0000 |
| commit | e3ecefbd23d297ed659422db4b9a886dbfebbdca (patch) | |
| tree | df0bed58a47a8bf0bbbeaedb0bb36f169b2ee85d | |
| parent | 67dd9a73dcb62e5b072244dddd7b19d521e20e67 (diff) | |
| download | upstream-e3ecefbd23d297ed659422db4b9a886dbfebbdca.tar.gz upstream-e3ecefbd23d297ed659422db4b9a886dbfebbdca.tar.bz2 upstream-e3ecefbd23d297ed659422db4b9a886dbfebbdca.zip | |
fix adm switch misdetection, which led to bogus button events that caused the system to shut down
SVN-Revision: 9555
| -rw-r--r-- | package/broadcom-diag/src/diag.c | 2 | ||||
| -rw-r--r-- | package/switch/src/switch-adm.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/package/broadcom-diag/src/diag.c b/package/broadcom-diag/src/diag.c index c7b3ead363..94ab384d30 100644 --- a/package/broadcom-diag/src/diag.c +++ b/package/broadcom-diag/src/diag.c @@ -738,7 +738,7 @@ static struct platform_t __init *platform_detect(void) return &platforms[WR850GV2V3]; } - if (!strcmp(boardnum, "44")) { /* Trendware TEW-411BRP+ */ + if (!strcmp(boardnum, "44") && !strcmp(getvar("boardflags"),"0x0388")) { /* Trendware TEW-411BRP+ */ return &platforms[TEW411BRPP]; } diff --git a/package/switch/src/switch-adm.c b/package/switch/src/switch-adm.c index 0fb21ffaaf..8d5de04b48 100644 --- a/package/switch/src/switch-adm.c +++ b/package/switch/src/switch-adm.c @@ -500,13 +500,13 @@ static int detect_adm(void) int boardflags = atoi(nvram_get("boardflags")); int boardnum = atoi(nvram_get("boardnum")); - if (boardnum == 44) { /* Trendware TEW-411BRP+ */ - ret = 1; + if ((boardnum == 44) && (boardflags == 0x0388)) { /* Trendware TEW-411BRP+ */ + ret = 1; - eecs = get_gpiopin("adm_eecs", 2); - eesk = get_gpiopin("adm_eesk", 3); - eedi = get_gpiopin("adm_eedi", 4); - eerc = get_gpiopin("adm_rc", 5); + eecs = get_gpiopin("adm_eecs", 2); + eesk = get_gpiopin("adm_eesk", 3); + eedi = get_gpiopin("adm_eedi", 4); + eerc = get_gpiopin("adm_rc", 5); } else if ((boardflags & 0x80) || force) { ret = 1; |