318e19ba67
adds v4.14 patches for testing but leaves v4.9 as default for now. Signed-off-by: John Crispin <john@phrozen.org>
25 lines
580 B
Diff
25 lines
580 B
Diff
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;
|