diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-07-19 17:58:40 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-07-19 17:58:40 +0000 |
| commit | 78b1a6b773aaebdeff6f6b43df98598749e44930 (patch) | |
| tree | 1cacb1c7de856ee70af780d86e6c70b9559bb247 /target/linux/ar71xx/patches-4.1/611-MIPS-ath79-wdt-timeout.patch | |
| parent | d26e8d9439052ed8f433b6ffb15a5f0c54712121 (diff) | |
| download | master-31e0f0ae-78b1a6b773aaebdeff6f6b43df98598749e44930.tar.gz master-31e0f0ae-78b1a6b773aaebdeff6f6b43df98598749e44930.tar.bz2 master-31e0f0ae-78b1a6b773aaebdeff6f6b43df98598749e44930.zip | |
ar71xx: add 4.1 support
Signed-off-by: Roman Yeryomin <roman@advem.lv>
SVN-Revision: 46426
Diffstat (limited to 'target/linux/ar71xx/patches-4.1/611-MIPS-ath79-wdt-timeout.patch')
| -rw-r--r-- | target/linux/ar71xx/patches-4.1/611-MIPS-ath79-wdt-timeout.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/target/linux/ar71xx/patches-4.1/611-MIPS-ath79-wdt-timeout.patch b/target/linux/ar71xx/patches-4.1/611-MIPS-ath79-wdt-timeout.patch new file mode 100644 index 0000000000..7a70ac3f87 --- /dev/null +++ b/target/linux/ar71xx/patches-4.1/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; |