diff options
| author | Waldemar Brodkorb <wbrodkorb@conet.de> | 2014-12-10 18:09:59 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbrodkorb@conet.de> | 2014-12-10 18:09:59 +0100 |
| commit | daa3380b867d91e1f20abf3ba6697e46966060ac (patch) | |
| tree | 98a4bf1a82e8955d5d2ebaad3b6096272db547fa /target/mips/mikrotik-rb4xx/patches/3.14.26/0017-MIPS-ath79-fix-maximum-timeout.patch | |
| parent | 79f366c144db32e623a8280d3d9472df2a25a9ca (diff) | |
| parent | 86bcc78d0d03a84b4de26db90603f7d66e6c3d2e (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/mips/mikrotik-rb4xx/patches/3.14.26/0017-MIPS-ath79-fix-maximum-timeout.patch')
| -rw-r--r-- | target/mips/mikrotik-rb4xx/patches/3.14.26/0017-MIPS-ath79-fix-maximum-timeout.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/target/mips/mikrotik-rb4xx/patches/3.14.26/0017-MIPS-ath79-fix-maximum-timeout.patch b/target/mips/mikrotik-rb4xx/patches/3.14.26/0017-MIPS-ath79-fix-maximum-timeout.patch new file mode 100644 index 000000000..3ca02783d --- /dev/null +++ b/target/mips/mikrotik-rb4xx/patches/3.14.26/0017-MIPS-ath79-fix-maximum-timeout.patch @@ -0,0 +1,37 @@ +From 54d01581baa903adb8515625d98652ed43efba36 Mon Sep 17 00:00:00 2001 +From: Phil Sutter <phil@nwl.cc> +Date: Tue, 13 May 2014 01:21:59 +0200 +Subject: [PATCH] MIPS: ath79: fix maximum timeout + +If the userland tries to set a timeout higher than the max_timeout, then +we should fallback to max_timeout. + +Signed-off-by: John Crispin <blogic@openwrt.org> +--- + drivers/watchdog/ath79_wdt.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/drivers/watchdog/ath79_wdt.c b/drivers/watchdog/ath79_wdt.c +index 9fa1f69..bf26baf 100644 +--- a/drivers/watchdog/ath79_wdt.c ++++ b/drivers/watchdog/ath79_wdt.c +@@ -105,10 +105,14 @@ static inline void ath79_wdt_disable(void) + + static int ath79_wdt_set_timeout(int val) + { +- if (val < 1 || val > max_timeout) ++ if (val < 1) + return -EINVAL; + +- timeout = val; ++ if (val > max_timeout) ++ timeout = max_timeout; ++ else ++ timeout = val; ++ + ath79_wdt_keepalive(); + + return 0; +-- +1.8.5.3 + |