mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 06:33:41 +00:00
8299d1f057
Rebased RPi foundation patches on linux 5.10.59, removed applied and reverted patches, wireless patches and defconfig patches. bcm2708: boot tested on RPi B+ v1.2 bcm2709: boot tested on RPi 4B v1.1 4G bcm2711: boot tested on RPi 4B v1.1 4G Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
30 lines
964 B
Diff
30 lines
964 B
Diff
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);
|