diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-08-07 12:40:53 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-08-07 12:40:53 +0000 |
commit | ff536dcd1ca51df92622d7e9216e4cd908f07837 (patch) | |
tree | 678abd256de087993fc1dd84f181aacf099d5b04 /target/linux/ar71xx/patches-3.14/611-MIPS-ath79-wdt-timeout.patch | |
parent | ce71c40c2491c5ce841e62b9ce0e73efb6339049 (diff) | |
download | upstream-ff536dcd1ca51df92622d7e9216e4cd908f07837.tar.gz upstream-ff536dcd1ca51df92622d7e9216e4cd908f07837.tar.bz2 upstream-ff536dcd1ca51df92622d7e9216e4cd908f07837.zip |
ar71xx: add linux 3.14 support
Signed-off-by: Zhao, Gang <gang.zhao.42@gmail.com>
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42038 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/patches-3.14/611-MIPS-ath79-wdt-timeout.patch')
-rw-r--r-- | target/linux/ar71xx/patches-3.14/611-MIPS-ath79-wdt-timeout.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/target/linux/ar71xx/patches-3.14/611-MIPS-ath79-wdt-timeout.patch b/target/linux/ar71xx/patches-3.14/611-MIPS-ath79-wdt-timeout.patch new file mode 100644 index 0000000000..0927d5a977 --- /dev/null +++ b/target/linux/ar71xx/patches-3.14/611-MIPS-ath79-wdt-timeout.patch @@ -0,0 +1,25 @@ +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> + +--- a/drivers/watchdog/ath79_wdt.c ++++ b/drivers/watchdog/ath79_wdt.c +@@ -115,10 +115,14 @@ static inline void ath79_wdt_disable(voi + + 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; |