Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+4 -2
+3 -1
drivers/watchdog/exar_wdt.c
··· 355 355 &priv->wdt_res, 1, 356 356 priv, sizeof(*priv)); 357 357 if (IS_ERR(n->pdev)) { 358 + int err = PTR_ERR(n->pdev); 359 + 358 360 kfree(n); 359 - return PTR_ERR(n->pdev); 361 + return err; 360 362 } 361 363 362 364 list_add_tail(&n->list, &pdev_list);
+1 -1
drivers/watchdog/sp805_wdt.c
··· 88 88 return (wdtcontrol & ENABLE_MASK) == ENABLE_MASK; 89 89 } 90 90 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 */ 92 92 static int wdt_setload(struct watchdog_device *wdd, unsigned int timeout) 93 93 { 94 94 struct sp805_wdt *wdt = watchdog_get_drvdata(wdd);