diff options
Diffstat (limited to 'kernel/drivers/watchdog/tegra_wdt.c')
| -rw-r--r-- | kernel/drivers/watchdog/tegra_wdt.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/drivers/watchdog/tegra_wdt.c b/kernel/drivers/watchdog/tegra_wdt.c index 30451ea46..9ec57608d 100644 --- a/kernel/drivers/watchdog/tegra_wdt.c +++ b/kernel/drivers/watchdog/tegra_wdt.c @@ -140,8 +140,10 @@ static int tegra_wdt_set_timeout(struct watchdog_device *wdd, { wdd->timeout = timeout; - if (watchdog_active(wdd)) + if (watchdog_active(wdd)) { + tegra_wdt_stop(wdd); return tegra_wdt_start(wdd); + } return 0; } @@ -218,6 +220,7 @@ static int tegra_wdt_probe(struct platform_device *pdev) wdd->ops = &tegra_wdt_ops; wdd->min_timeout = MIN_WDT_TIMEOUT; wdd->max_timeout = MAX_WDT_TIMEOUT; + wdd->parent = &pdev->dev; watchdog_set_drvdata(wdd, wdt); |