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 'fixes-rc1' into omap-for-v4.3/fixes
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
watchdog
/
ie6xx_wdt.c
diff --git
a/drivers/watchdog/ie6xx_wdt.c
b/drivers/watchdog/ie6xx_wdt.c
index 9bc39ae51624c48d1ac4b263d1989e766c60c383..78c2541f5d52d31af60e239dafd417b2cabd4cc8 100644
(file)
--- a/
drivers/watchdog/ie6xx_wdt.c
+++ b/
drivers/watchdog/ie6xx_wdt.c
@@
-267,6
+267,7
@@
static int ie6xx_wdt_probe(struct platform_device *pdev)
ie6xx_wdt_dev.timeout = timeout;
watchdog_set_nowayout(&ie6xx_wdt_dev, nowayout);
+ ie6xx_wdt_dev.parent = &pdev->dev;
spin_lock_init(&ie6xx_wdt_data.unlock_sequence);