3771176c9e
The following patches are dropped because they are merged upstream: -0001-tty-serial-drop-QCA-pecific-SoC-symbols.patch -0006-usb-drop-deprecated-symbols.patch -0009-MIPS-ath79-add-lots-of-missing-registers.patch -0010-MIPS-ath79-add-support-for-QCA953x-QCA956x-TP9343.patch -0014-MIPS-ath79-finetune-cpu-overrides.patch -0015-MIPS-ath79-enable-uart-during-early_prink.patch -0016-MIPS-ath79-get-PCIe-controller-out-of-reset.patch This patch is dropped due to the introduction of spi-mem framework: -461-spi-ath79-add-fast-flash-read.patch Thank to Michael Marley @mamarley for his work on this patch: -910-unaligned_access_hacks.patch Signed-off-by: Chuanhong Guo <gch981213@gmail.com> [synchronized kernel config with make kernel_oldconfig] Signed-off-by: Petr Štetiar <ynezz@true.cz>
33 lines
847 B
Diff
33 lines
847 B
Diff
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;
|