Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge git://www.linux-watchdog.org/linux-watchdog 

Pull watchdog fixes from Wim Van Sebroeck:

 - mtk_wdt: signedness bug in mtk_wdt_start()

 - imgpdc: Fix NULL pointer dereference during probe and fix the default
   heartbeat

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: imgpdc: Fix default heartbeat
  watchdog: imgpdc: Fix probe NULL pointer dereference
  watchdog: mtk_wdt: signedness bug in mtk_wdt_start()
parents a7fe850d ae6ee2fd

drivers/watchdog/imgpdc_wdt.c

+4 −4
Original line number Diff line number Diff line
@@ -42,9 +42,9 @@ 
#define PDC_WDT_MIN_TIMEOUT		1

#define PDC_WDT_DEF_TIMEOUT		64



static int heartbeat;

static int heartbeat = PDC_WDT_DEF_TIMEOUT;

module_param(heartbeat, int, 0);

MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds. "

MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds "

	"(default=" __MODULE_STRING(PDC_WDT_DEF_TIMEOUT) ")");



static bool nowayout = WATCHDOG_NOWAYOUT;
@@ -191,6 +191,7 @@ static int pdc_wdt_probe(struct platform_device *pdev) 
	pdc_wdt->wdt_dev.ops = &pdc_wdt_ops;

	pdc_wdt->wdt_dev.max_timeout = 1 << PDC_WDT_CONFIG_DELAY_MASK;

	pdc_wdt->wdt_dev.parent = &pdev->dev;

	watchdog_set_drvdata(&pdc_wdt->wdt_dev, pdc_wdt);



	ret = watchdog_init_timeout(&pdc_wdt->wdt_dev, heartbeat, &pdev->dev);

	if (ret < 0) {
@@ -232,7 +233,6 @@ static int pdc_wdt_probe(struct platform_device *pdev) 
	watchdog_set_nowayout(&pdc_wdt->wdt_dev, nowayout);



	platform_set_drvdata(pdev, pdc_wdt);

	watchdog_set_drvdata(&pdc_wdt->wdt_dev, pdc_wdt);



	ret = watchdog_register_device(&pdc_wdt->wdt_dev);

	if (ret)

drivers/watchdog/mtk_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static int mtk_wdt_start(struct watchdog_device *wdt_dev) 
	u32 reg;

	struct mtk_wdt_dev *mtk_wdt = watchdog_get_drvdata(wdt_dev);

	void __iomem *wdt_base = mtk_wdt->wdt_base;

	u32 ret;

	int ret;



	ret = mtk_wdt_set_timeout(wdt_dev, wdt_dev->timeout);

	if (ret < 0)