diff options
| author | John Crispin <john@phrozen.org> | 2018-08-09 15:59:41 +0200 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2018-08-22 08:09:00 +0200 |
| commit | 318e19ba6755105bb6cc19937d8fff26cbd2cc6f (patch) | |
| tree | 2f7c96140932a2770fb767141c7d1e93d29127b0 /target/linux/ar71xx/patches-4.14/611-MIPS-ath79-wdt-timeout.patch | |
| parent | e5f56c07d7fab9a6f2201f4100b593349b8ef67d (diff) | |
| download | upstream-318e19ba6755105bb6cc19937d8fff26cbd2cc6f.tar.gz upstream-318e19ba6755105bb6cc19937d8fff26cbd2cc6f.tar.bz2 upstream-318e19ba6755105bb6cc19937d8fff26cbd2cc6f.zip | |
ar71xx: add v4.14 support
adds v4.14 patches for testing but leaves v4.9 as default for now.
Signed-off-by: John Crispin <john@phrozen.org>
Diffstat (limited to 'target/linux/ar71xx/patches-4.14/611-MIPS-ath79-wdt-timeout.patch')
| -rw-r--r-- | target/linux/ar71xx/patches-4.14/611-MIPS-ath79-wdt-timeout.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/target/linux/ar71xx/patches-4.14/611-MIPS-ath79-wdt-timeout.patch b/target/linux/ar71xx/patches-4.14/611-MIPS-ath79-wdt-timeout.patch new file mode 100644 index 0000000000..0927d5a977 --- /dev/null +++ b/target/linux/ar71xx/patches-4.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; |