diff options
author | John Crispin <john@openwrt.org> | 2015-03-16 07:40:09 +0000 |
---|---|---|
committer | John Crispin <john@openwrt.org> | 2015-03-16 07:40:09 +0000 |
commit | fb78ebb813abcefbbec3c824d09357428ff3b848 (patch) | |
tree | 17d1b5d12b3039e71085e754710d8b4f4eff2d9e /target/linux/ar71xx/patches-3.14/611-MIPS-ath79-wdt-timeout.patch | |
parent | de04a1d843cc0cc797c42e6541907ba5555de898 (diff) | |
download | upstream-fb78ebb813abcefbbec3c824d09357428ff3b848.tar.gz upstream-fb78ebb813abcefbbec3c824d09357428ff3b848.tar.bz2 upstream-fb78ebb813abcefbbec3c824d09357428ff3b848.zip |
ar71xx: drop 3.14 support
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 44815
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, 0 insertions, 25 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 deleted file mode 100644 index 0927d5a977..0000000000 --- a/target/linux/ar71xx/patches-3.14/611-MIPS-ath79-wdt-timeout.patch +++ /dev/null @@ -1,25 +0,0 @@ -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; |