7bbf4117c6
This add support for kernel 4.9 to the ar71xx target. It was compile tested with the generic, NAND and mikrotik subtarget. Multiple members of the community tested it on their boards and did not report any major problem so far. Especially the NAND part received some changes to adapt to the new kernel APIs. The serial driver hack used for the Arduino Yun was not ported because the kernel changed there a lot. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
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;
|