projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
watchdog
/
stmp3xxx_rtc_wdt.c
diff --git
a/drivers/watchdog/stmp3xxx_rtc_wdt.c
b/drivers/watchdog/stmp3xxx_rtc_wdt.c
index e7f0d5b60d3d4febb20759ea893dc0432d4963ee..3ee6128a540e9896248ebd5cdad6bc3065170831 100644
(file)
--- a/
drivers/watchdog/stmp3xxx_rtc_wdt.c
+++ b/
drivers/watchdog/stmp3xxx_rtc_wdt.c
@@
-76,6
+76,7
@@
static int stmp3xxx_wdt_probe(struct platform_device *pdev)
watchdog_set_drvdata(&stmp3xxx_wdd, &pdev->dev);
stmp3xxx_wdd.timeout = clamp_t(unsigned, heartbeat, 1, STMP3XXX_MAX_TIMEOUT);
+ stmp3xxx_wdd.parent = &pdev->dev;
ret = watchdog_register_device(&stmp3xxx_wdd);
if (ret < 0) {