summaryrefslogtreecommitdiff
path: root/target/mips/mikrotik-rb4xx/patches/3.14.9/0017-MIPS-ath79-fix-maximum-timeout.patch
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-06-30 07:09:50 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-06-30 07:10:11 +0200
commitaa6259aed442339ba288d5a0e704eb22465c426e (patch)
tree2dab6fe5d3edfa8f1abaf59119c7d849aaab0593 /target/mips/mikrotik-rb4xx/patches/3.14.9/0017-MIPS-ath79-fix-maximum-timeout.patch
parent155e38be229580dfad4792b3a8e702c31ca193b0 (diff)
bump kernels
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.patch37
1 files changed, 37 insertions, 0 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
new file mode 100644
index 000000000..3ca02783d
--- /dev/null
+++ b/target/mips/mikrotik-rb4xx/patches/3.14.9/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
+