You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
26 lines
580 B
26 lines
580 B
9 years ago
|
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;
|