1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter.git synced 2025-02-15 04:42:02 +00:00
openmptcprouter/root/target/linux/bcm27xx/patches-5.15/950-0314-watchdog-bcm2835-Ignore-params-after-the-partition-n.patch

30 lines
972 B
Diff
Raw Normal View History

2022-04-22 15:00:47 +00:00
From 29bddf84d2171caf00c8e7db2fa928090080c1ba Mon Sep 17 00:00:00 2001
2021-11-24 17:32:01 +00:00
From: Tim Gover <tim.gover@raspberrypi.org>
Date: Thu, 22 Oct 2020 15:30:55 +0100
2022-04-22 15:00:47 +00:00
Subject: [PATCH 314/828] watchdog: bcm2835: Ignore params after the partition
2021-11-24 17:32:01 +00:00
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
2022-04-22 15:00:47 +00:00
@@ -126,10 +126,12 @@ static int bcm2835_restart(struct watchd
2021-11-24 17:32:01 +00:00
{
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);