diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-09-25 08:06:20 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-09-25 08:06:20 +0200 |
| commit | 39bdcdfb814a22c8143c04938268378e9994b7dd (patch) | |
| tree | 4eeea3247892cab65f10a25d2910fad021cbe7f0 /drivers/watchdog | |
| parent | e083790340aa4cf1b8edaa50f6b9fbb1edfe56d0 (diff) | |
| parent | 8fb0a2bf6efb67084a5d7a7f3822b4d480fca685 (diff) | |
| download | barebox-39bdcdfb814a22c8143c04938268378e9994b7dd.tar.gz barebox-39bdcdfb814a22c8143c04938268378e9994b7dd.tar.xz | |
Merge branch 'for-next/misc' into master
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/efi_wdt.c | 2 | ||||
| -rw-r--r-- | drivers/watchdog/stpmic1_wdt.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/efi_wdt.c b/drivers/watchdog/efi_wdt.c index ea1ede1381..1512b1d99a 100644 --- a/drivers/watchdog/efi_wdt.c +++ b/drivers/watchdog/efi_wdt.c @@ -24,7 +24,7 @@ static int efi_wdt_set_timeout(struct watchdog *wd, unsigned timeout) efiret = BS->set_watchdog_timer(timeout, 0, 0, NULL); if (EFI_ERROR(efiret)) { - dev_err(priv->dev, "filed to set EFI watchdog: %lx\n", efiret); + dev_err(priv->dev, "failed to set EFI watchdog: %lx\n", efiret); return -EINVAL; } diff --git a/drivers/watchdog/stpmic1_wdt.c b/drivers/watchdog/stpmic1_wdt.c index 458c5c16a3..12280f1447 100644 --- a/drivers/watchdog/stpmic1_wdt.c +++ b/drivers/watchdog/stpmic1_wdt.c @@ -200,7 +200,7 @@ static int stpmic1_wdt_probe(struct device_d *dev) if (ret) dev_warn(dev, "Cannot register poweroff handler\n"); - stpmic1_set_reset_reason(wdt->regmap); + ret = stpmic1_set_reset_reason(wdt->regmap); if (ret) dev_warn(dev, "Cannot query reset reason\n"); |