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
/
digicolor_wdt.c
diff --git
a/drivers/watchdog/digicolor_wdt.c
b/drivers/watchdog/digicolor_wdt.c
index 31d8e4936611e48f3d774b22cd1cef64d7e2e508..50abe1bf62a50a9a914d53e2c5cd0469fafb84fd 100644
(file)
--- a/
drivers/watchdog/digicolor_wdt.c
+++ b/
drivers/watchdog/digicolor_wdt.c
@@
-143,6
+143,7
@@
static int dc_wdt_probe(struct platform_device *pdev)
}
dc_wdt_wdd.max_timeout = U32_MAX / clk_get_rate(wdt->clk);
dc_wdt_wdd.timeout = dc_wdt_wdd.max_timeout;
}
dc_wdt_wdd.max_timeout = U32_MAX / clk_get_rate(wdt->clk);
dc_wdt_wdd.timeout = dc_wdt_wdd.max_timeout;
+ dc_wdt_wdd.parent = &pdev->dev;
spin_lock_init(&wdt->lock);
spin_lock_init(&wdt->lock);