diff options
| author | John Crispin <blogic@openwrt.org> | 2015-02-15 19:45:29 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2015-02-15 19:45:29 +0000 |
| commit | c77c54e6845c201483a75dfc931f7065d3d35c84 (patch) | |
| tree | ba56f28512a840dcad307d78c1c063637a014f36 /target/linux/ar71xx/patches-3.18/611-MIPS-ath79-wdt-timeout.patch | |
| parent | beb7f2ac7b5c617cd3e1b0060c15b1e71f8faa5c (diff) | |
| download | upstream-c77c54e6845c201483a75dfc931f7065d3d35c84.tar.gz upstream-c77c54e6845c201483a75dfc931f7065d3d35c84.tar.bz2 upstream-c77c54e6845c201483a75dfc931f7065d3d35c84.zip | |
ar71xx: add v3.18 support
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44456 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/patches-3.18/611-MIPS-ath79-wdt-timeout.patch')
| -rw-r--r-- | target/linux/ar71xx/patches-3.18/611-MIPS-ath79-wdt-timeout.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/target/linux/ar71xx/patches-3.18/611-MIPS-ath79-wdt-timeout.patch b/target/linux/ar71xx/patches-3.18/611-MIPS-ath79-wdt-timeout.patch new file mode 100644 index 0000000000..7a70ac3f87 --- /dev/null +++ b/target/linux/ar71xx/patches-3.18/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 +@@ -114,10 +114,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; |