diff options
| author | Tony Lindgren <tony@atomide.com> | 2015-09-14 23:42:11 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-09-14 23:42:11 +0300 |
| commit | 7168e947291f0ead07e5638b4599fb7845288b69 (patch) | |
| tree | b39cdf02f6d2282eeb91696d4a1c7ddb6afb0e38 /drivers/watchdog/twl4030_wdt.c | |
| parent | 21b430d23d233c67e6589ea5054d18392e15a28e (diff) | |
| parent | 60fdcb8863d9b4a8b6c6b367886fadb50d4c0b07 (diff) | |
| download | linux-7168e947291f0ead07e5638b4599fb7845288b69.tar.xz | |
Merge branch 'fixes-rc1' into omap-for-v4.3/fixes
Diffstat (limited to 'drivers/watchdog/twl4030_wdt.c')
| -rw-r--r-- | drivers/watchdog/twl4030_wdt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/watchdog/twl4030_wdt.c b/drivers/watchdog/twl4030_wdt.c index 2c1db6fa9a27..9bf3cc0f3961 100644 --- a/drivers/watchdog/twl4030_wdt.c +++ b/drivers/watchdog/twl4030_wdt.c @@ -83,6 +83,7 @@ static int twl4030_wdt_probe(struct platform_device *pdev) wdt->timeout = 30; wdt->min_timeout = 1; wdt->max_timeout = 30; + wdt->parent = &pdev->dev; watchdog_set_nowayout(wdt, nowayout); platform_set_drvdata(pdev, wdt); |