aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2013-07-14 18:01:09 +0000
committerJohn Crispin <blogic@openwrt.org>2013-07-14 18:01:09 +0000
commit7c87681a6fc48ac09435b09590fc064cea41f59e (patch)
tree05636e4a8d414735b6580f36d5f38ebeb8e3c25f /target
parent24f20fee78c4bdf7f787f556c3ac0a1ce37e1788 (diff)
downloadupstream-7c87681a6fc48ac09435b09590fc064cea41f59e.tar.gz
upstream-7c87681a6fc48ac09435b09590fc064cea41f59e.tar.bz2
upstream-7c87681a6fc48ac09435b09590fc064cea41f59e.zip
ar71xx: fix maximum watchdog timeout
Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37315 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/ar71xx/patches-3.10/611-MIPS-ath79-wdt-timeout.patch27
-rw-r--r--target/linux/ar71xx/patches-3.8/611-MIPS-ath79-wdt-timeout.patch27
2 files changed, 54 insertions, 0 deletions
diff --git a/target/linux/ar71xx/patches-3.10/611-MIPS-ath79-wdt-timeout.patch b/target/linux/ar71xx/patches-3.10/611-MIPS-ath79-wdt-timeout.patch
new file mode 100644
index 0000000000..8a933ef378
--- /dev/null
+++ b/target/linux/ar71xx/patches-3.10/611-MIPS-ath79-wdt-timeout.patch
@@ -0,0 +1,27 @@
+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>
+
+Index: linux-3.8.13/drivers/watchdog/ath79_wdt.c
+===================================================================
+--- linux-3.8.13.orig/drivers/watchdog/ath79_wdt.c 2013-07-14 14:10:19.198826462 +0200
++++ linux-3.8.13/drivers/watchdog/ath79_wdt.c 2013-07-14 14:25:40.810848422 +0200
+@@ -103,10 +103,14 @@
+
+ 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;
diff --git a/target/linux/ar71xx/patches-3.8/611-MIPS-ath79-wdt-timeout.patch b/target/linux/ar71xx/patches-3.8/611-MIPS-ath79-wdt-timeout.patch
new file mode 100644
index 0000000000..8a933ef378
--- /dev/null
+++ b/target/linux/ar71xx/patches-3.8/611-MIPS-ath79-wdt-timeout.patch
@@ -0,0 +1,27 @@
+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>
+
+Index: linux-3.8.13/drivers/watchdog/ath79_wdt.c
+===================================================================
+--- linux-3.8.13.orig/drivers/watchdog/ath79_wdt.c 2013-07-14 14:10:19.198826462 +0200
++++ linux-3.8.13/drivers/watchdog/ath79_wdt.c 2013-07-14 14:25:40.810848422 +0200
+@@ -103,10 +103,14 @@
+
+ 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;