Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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()
+5
-5
+4
-4
drivers/watchdog/imgpdc_wdt.c
+4
-4
drivers/watchdog/imgpdc_wdt.c
···
42
42
#define PDC_WDT_MIN_TIMEOUT 1
43
43
#define PDC_WDT_DEF_TIMEOUT 64
44
44
45
-
static int heartbeat;
45
+
static int heartbeat = PDC_WDT_DEF_TIMEOUT;
46
46
module_param(heartbeat, int, 0);
47
-
MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds. "
48
-
"(default = " __MODULE_STRING(PDC_WDT_DEF_TIMEOUT) ")");
47
+
MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds "
48
+
"(default=" __MODULE_STRING(PDC_WDT_DEF_TIMEOUT) ")");
49
49
50
50
static bool nowayout = WATCHDOG_NOWAYOUT;
51
51
module_param(nowayout, bool, 0);
···
191
191
pdc_wdt->wdt_dev.ops = &pdc_wdt_ops;
192
192
pdc_wdt->wdt_dev.max_timeout = 1 << PDC_WDT_CONFIG_DELAY_MASK;
193
193
pdc_wdt->wdt_dev.parent = &pdev->dev;
194
+
watchdog_set_drvdata(&pdc_wdt->wdt_dev, pdc_wdt);
194
195
195
196
ret = watchdog_init_timeout(&pdc_wdt->wdt_dev, heartbeat, &pdev->dev);
196
197
if (ret < 0) {
···
233
232
watchdog_set_nowayout(&pdc_wdt->wdt_dev, nowayout);
234
233
235
234
platform_set_drvdata(pdev, pdc_wdt);
236
-
watchdog_set_drvdata(&pdc_wdt->wdt_dev, pdc_wdt);
237
235
238
236
ret = watchdog_register_device(&pdc_wdt->wdt_dev);
239
237
if (ret)