aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-5.4/950-1008-watchdog-bcm2835-Ignore-params-after-the-partition-n.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-1008-watchdog-bcm2835-Ignore-params-after-the-partition-n.patch')
-rw-r--r--target/linux/bcm27xx/patches-5.4/950-1008-watchdog-bcm2835-Ignore-params-after-the-partition-n.patch29
1 files changed, 0 insertions, 29 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-1008-watchdog-bcm2835-Ignore-params-after-the-partition-n.patch b/target/linux/bcm27xx/patches-5.4/950-1008-watchdog-bcm2835-Ignore-params-after-the-partition-n.patch
deleted file mode 100644
index 44108ecda5..0000000000
--- a/target/linux/bcm27xx/patches-5.4/950-1008-watchdog-bcm2835-Ignore-params-after-the-partition-n.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 118538ed52b7dd927226837094d44a5d1cd14ab7 Mon Sep 17 00:00:00 2001
-From: Tim Gover <tim.gover@raspberrypi.org>
-Date: Thu, 22 Oct 2020 15:30:55 +0100
-Subject: [PATCH] watchdog: bcm2835: Ignore params after the
- partition number
-
-Use sscanf to extract the partition number and ignore extra parameters
-which are only relevant to other reboot notifiers.
----
- drivers/watchdog/bcm2835_wdt.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/drivers/watchdog/bcm2835_wdt.c
-+++ b/drivers/watchdog/bcm2835_wdt.c
-@@ -126,10 +126,12 @@ static int bcm2835_restart(struct watchd
- {
- struct bcm2835_wdt *wdt = watchdog_get_drvdata(wdog);
-
-- unsigned long long val;
-+ unsigned long val;
- u8 partition = 0;
-
-- if (data && !kstrtoull(data, 0, &val) && val <= 63)
-+ // Allow extra arguments separated by spaces after
-+ // the partition number.
-+ if (data && sscanf(data, "%lu", &val) && val < 63)
- partition = val;
-
- __bcm2835_restart(wdt, partition);