diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-07-22 19:41:50 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-07-22 19:42:41 +0200 |
| commit | 83269248e437d15f040975e5d40dfc9ad599ab0e (patch) | |
| tree | 5355dfda20e364df32ee2a1122b04ab950100fa5 /target/mips/mikrotik-rb4xx/patches/3.14.9/0017-MIPS-ath79-fix-maximum-timeout.patch | |
| parent | f964a806c5784f4a0144deffcfbd3c4e6e4da244 (diff) | |
bump kernel versions, readd sm7xx driver for 3.15.x
Diffstat (limited to 'target/mips/mikrotik-rb4xx/patches/3.14.9/0017-MIPS-ath79-fix-maximum-timeout.patch')
| -rw-r--r-- | target/mips/mikrotik-rb4xx/patches/3.14.9/0017-MIPS-ath79-fix-maximum-timeout.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/target/mips/mikrotik-rb4xx/patches/3.14.9/0017-MIPS-ath79-fix-maximum-timeout.patch b/target/mips/mikrotik-rb4xx/patches/3.14.9/0017-MIPS-ath79-fix-maximum-timeout.patch deleted file mode 100644 index 3ca02783d..000000000 --- a/target/mips/mikrotik-rb4xx/patches/3.14.9/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 - |