blob: dba18c6fc689c8dd824077ae9a73fd3f1c07f47d (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
From c518032ec09c3e21872a5b2f9114655d55d9ade1 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);
|
