From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 17 Oct 2021 14:57:44 +0000 (+0200)
Subject: 5.4-stable patches
X-Git-Tag: v4.14.252~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4306d0c6dcfcc9f2ef72886729cd8414b045c01a;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

added patches:
	watchdog-orion-use-0-for-unset-heartbeat.patch
---

diff --git a/queue-5.4/series b/queue-5.4/series
index 4efea96abad..c1774da3f87 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -13,3 +13,4 @@ btrfs-unlock-newly-allocated-extent-buffer-after-error.patch
 btrfs-deal-with-errors-when-replaying-dir-entry-during-log-replay.patch
 btrfs-deal-with-errors-when-adding-inode-reference-during-log-replay.patch
 btrfs-check-for-error-when-looking-up-inode-during-dir-entry-replay.patch
+watchdog-orion-use-0-for-unset-heartbeat.patch
diff --git a/queue-5.4/watchdog-orion-use-0-for-unset-heartbeat.patch b/queue-5.4/watchdog-orion-use-0-for-unset-heartbeat.patch
new file mode 100644
index 00000000000..a97c44ca46e
--- /dev/null
+++ b/queue-5.4/watchdog-orion-use-0-for-unset-heartbeat.patch
@@ -0,0 +1,41 @@
+From bb914088bd8a91c382f54d469367b2e5508b5493 Mon Sep 17 00:00:00 2001
+From: Chris Packham <chris.packham@alliedtelesis.co.nz>
+Date: Fri, 13 Mar 2020 16:13:12 +1300
+Subject: watchdog: orion: use 0 for unset heartbeat
+
+From: Chris Packham <chris.packham@alliedtelesis.co.nz>
+
+commit bb914088bd8a91c382f54d469367b2e5508b5493 upstream.
+
+If the heartbeat module param is not specified we would get an error
+message
+
+  watchdog: f1020300.watchdog: driver supplied timeout (4294967295) out of range
+  watchdog: f1020300.watchdog: falling back to default timeout (171)
+
+This is because we were initialising heartbeat to -1. By removing the
+initialisation (thus letting the C run time initialise it to 0) we
+silence the warning message and the default timeout is still used.
+
+Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
+Reviewed-by: Guenter Roeck <linux@roeck-us.net>
+Link: https://lore.kernel.org/r/20200313031312.1485-1-chris.packham@alliedtelesis.co.nz
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
+Signed-off-by: Marek Behún <kabel@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/watchdog/orion_wdt.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/watchdog/orion_wdt.c
++++ b/drivers/watchdog/orion_wdt.c
+@@ -52,7 +52,7 @@
+ #define WDT_A370_RATIO		(1 << WDT_A370_RATIO_SHIFT)
+ 
+ static bool nowayout = WATCHDOG_NOWAYOUT;
+-static int heartbeat = -1;		/* module parameter (seconds) */
++static int heartbeat;		/* module parameter (seconds) */
+ 
+ struct orion_watchdog;
+