From: Tim Gover <tim.gover@raspberrypi.org>
Date: Thu, 22 Oct 2020 14:30:55 +0000 (+0100)
Subject: watchdog: bcm2835: Ignore params after the partition number
X-Git-Tag: accepted/tizen/unified/20210330.111217~469
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3b799b23157f8d3961971c5f956aaf79f0bf1de7;p=platform%2Fkernel%2Flinux-rpi.git

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.
---

diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c
index 62937e6..de25e36 100644
--- a/drivers/watchdog/bcm2835_wdt.c
+++ b/drivers/watchdog/bcm2835_wdt.c
@@ -126,10 +126,12 @@ static int bcm2835_restart(struct watchdog_device *wdog,
 {
 	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);