aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ath79/patches-4.14/0002-watchdog-ath79-fix-maximum-timeout.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@phrozen.org>2018-05-24 16:53:10 +0200
committerJohn Crispin <john@phrozen.org>2018-05-24 17:24:31 +0200
commit76ba98d9b0b6e06bb7e843207654223cb62518d6 (patch)
tree34fec623c4450216119aacf6b038bd3bc1742a69 /target/linux/ath79/patches-4.14/0002-watchdog-ath79-fix-maximum-timeout.patch
parent45456fe0c8af2274ccf5db57942a8009a841fac3 (diff)
downloadupstream-76ba98d9b0b6e06bb7e843207654223cb62518d6.tar.gz
upstream-76ba98d9b0b6e06bb7e843207654223cb62518d6.tar.bz2
upstream-76ba98d9b0b6e06bb7e843207654223cb62518d6.zip
ath79: drop, its not ready for a release yet
Signed-off-by: John Crispin <john@phrozen.org>
Diffstat (limited to 'target/linux/ath79/patches-4.14/0002-watchdog-ath79-fix-maximum-timeout.patch')
-rw-r--r--target/linux/ath79/patches-4.14/0002-watchdog-ath79-fix-maximum-timeout.patch32
1 files changed, 0 insertions, 32 deletions
diff --git a/target/linux/ath79/patches-4.14/0002-watchdog-ath79-fix-maximum-timeout.patch b/target/linux/ath79/patches-4.14/0002-watchdog-ath79-fix-maximum-timeout.patch
deleted file mode 100644
index 36234d8d83..0000000000
--- a/target/linux/ath79/patches-4.14/0002-watchdog-ath79-fix-maximum-timeout.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 5f5c9858af167f842ee8df053920b98387a71af1 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Mon, 5 Mar 2018 11:41:25 +0100
-Subject: [PATCH 02/27] watchdog: 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 <john@phrozen.org>
----
- drivers/watchdog/ath79_wdt.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
---- 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;