diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-05-25 10:58:22 -0500 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-05-25 10:59:55 -0500 |
| commit | cc0c042aafec40d93b06be3b6d7e94f38c5ac69f (patch) | |
| tree | f7e93262b1026a28e6c9efe78af6ad4f9b107293 /target/mips/dragino-ms14s/patches/3.14.40/0017-MIPS-ath79-fix-maximum-timeout.patch | |
| parent | 046bc39911f2e8006465153d6119738b1b849410 (diff) | |
update kernel to 3.14.43
Diffstat (limited to 'target/mips/dragino-ms14s/patches/3.14.40/0017-MIPS-ath79-fix-maximum-timeout.patch')
| -rw-r--r-- | target/mips/dragino-ms14s/patches/3.14.40/0017-MIPS-ath79-fix-maximum-timeout.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/target/mips/dragino-ms14s/patches/3.14.40/0017-MIPS-ath79-fix-maximum-timeout.patch b/target/mips/dragino-ms14s/patches/3.14.40/0017-MIPS-ath79-fix-maximum-timeout.patch deleted file mode 100644 index 3ca02783d..000000000 --- a/target/mips/dragino-ms14s/patches/3.14.40/0017-MIPS-ath79-fix-maximum-timeout.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 - |