Commit d79dcde0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 5aaef24b 82ebbe65

drivers/watchdog/exar_wdt.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -355,8 +355,10 @@ static int __init exar_wdt_register(struct wdt_priv *priv, const int idx) 
						    &priv->wdt_res, 1,

						    &priv->wdt_res, 1,

						    priv, sizeof(*priv));

						    priv, sizeof(*priv));

	if (IS_ERR(n->pdev)) {

	if (IS_ERR(n->pdev)) {

		int err = PTR_ERR(n->pdev);



		kfree(n);

		kfree(n);

		return PTR_ERR(n->pdev);

		return err;

	}

	}





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

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

drivers/watchdog/sp805_wdt.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -88,7 +88,7 @@ static bool wdt_is_running(struct watchdog_device *wdd) 
	return (wdtcontrol & ENABLE_MASK) == ENABLE_MASK;

	return (wdtcontrol & ENABLE_MASK) == ENABLE_MASK;

}

}





/* This routine finds load value that will reset system in required timout */

/* This routine finds load value that will reset system in required timeout */

static int wdt_setload(struct watchdog_device *wdd, unsigned int timeout)

static int wdt_setload(struct watchdog_device *wdd, unsigned int timeout)

{

{

	struct sp805_wdt *wdt = watchdog_get_drvdata(wdd);

	struct sp805_wdt *wdt = watchdog_get_drvdata(wdd);