KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ar71xx: fix maximum watchdog timeout

Browse source 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 37315
This commit is contained in:
John Crispin 2013-07-14 18:01:09 +00:00
parent f7cf157712
commit 3d15bc6fb2
2 changed files with 54 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
target/linux/ar71xx/patches-3.10/611-MIPS-ath79-wdt-timeout.patch Normal file
View file

@ -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;

27
target/linux/ar71xx/patches-3.8/611-MIPS-ath79-wdt-timeout.patch Normal file
View file

@ -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;