From 7051db7d6c01f967be526e3c4cdc215197862339 Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Thu, 22 Oct 2020 15:30:55 +0100 Subject: [PATCH 325/634] 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(-) diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c index 58d5a1b89584..e8d151d524fd 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); -- 2.33.1