Skip to content

Commit d79dcde

Browse files
committed
Merge tag 'linux-watchdog-6.1-rc4' of git://www.linux-watchdog.org/linux-watchdog
Pull watchdog fixes from Wim Van Sebroeck: - fix use after free in exar driver - spelling fix in comment * tag 'linux-watchdog-6.1-rc4' of git://www.linux-watchdog.org/linux-watchdog: drivers: watchdog: exar_wdt.c fix use after free watchdog: sp805_wdt: fix spelling typo in comment
2 parents 5aaef24 + 82ebbe6 commit d79dcde

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

drivers/watchdog/exar_wdt.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,8 +355,10 @@ static int __init exar_wdt_register(struct wdt_priv *priv, const int idx)
355355
&priv->wdt_res, 1,
356356
priv, sizeof(*priv));
357357
if (IS_ERR(n->pdev)) {
358+
int err = PTR_ERR(n->pdev);
359+
358360
kfree(n);
359-
return PTR_ERR(n->pdev);
361+
return err;
360362
}
361363

362364
list_add_tail(&n->list, &pdev_list);

drivers/watchdog/sp805_wdt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ static bool wdt_is_running(struct watchdog_device *wdd)
8888
return (wdtcontrol & ENABLE_MASK) == ENABLE_MASK;
8989
}
9090

91-
/* This routine finds load value that will reset system in required timout */
91+
/* This routine finds load value that will reset system in required timeout */
9292
static int wdt_setload(struct watchdog_device *wdd, unsigned int timeout)
9393
{
9494
struct sp805_wdt *wdt = watchdog_get_drvdata(wdd);

0 commit comments

Comments
 (0)