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 | e41a0cafff16f2443e587884782172c6d8478771 (patch) | |
| tree | 2ab441d85607622857c5d7602918d24312daa7ab /target/linux/ar71xx/patches-3.14/611-MIPS-ath79-wdt-timeout.patch | |
| parent | f75f9606ad6af9f4c62acd45741a7e3880ad7dbb (diff) | |
| download | master-31e0f0ae-e41a0cafff16f2443e587884782172c6d8478771.tar.gz master-31e0f0ae-e41a0cafff16f2443e587884782172c6d8478771.tar.bz2 master-31e0f0ae-e41a0cafff16f2443e587884782172c6d8478771.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>
SVN-Revision: 42038
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; |