OpenWrt – Blame information for rev 2

Subversion Repositories:
Rev:
Rev Author Line No. Line
1 office 1 From 5f5c9858af167f842ee8df053920b98387a71af1 Mon Sep 17 00:00:00 2001
2 From: John Crispin <john@phrozen.org>
3 Date: Mon, 5 Mar 2018 11:41:25 +0100
4 Subject: [PATCH 02/27] watchdog: ath79: fix maximum timeout
5  
6 If the userland tries to set a timeout higher than the max_timeout,
7 then we should fallback to max_timeout.
8  
9 Signed-off-by: John Crispin <john@phrozen.org>
10 ---
11 drivers/watchdog/ath79_wdt.c | 8 ++++++--
12 1 file changed, 6 insertions(+), 2 deletions(-)
13  
14 --- a/drivers/watchdog/ath79_wdt.c
15 +++ b/drivers/watchdog/ath79_wdt.c
16 @@ -115,10 +115,14 @@ static inline void ath79_wdt_disable(voi
17  
18 static int ath79_wdt_set_timeout(int val)
19 {
20 - if (val < 1 || val > max_timeout)
21 + if (val < 1)
22 return -EINVAL;
23  
24 - timeout = val;
25 + if (val > max_timeout)
26 + timeout = max_timeout;
27 + else
28 + timeout = val;
29 +
30 ath79_wdt_keepalive();
31  
32 return 0;