Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
To modify Ixia port numbers and IP in pod.yaml
[kvmfornfv.git]
/
kernel
/
drivers
/
watchdog
/
sp805_wdt.c
diff --git
a/kernel/drivers/watchdog/sp805_wdt.c
b/kernel/drivers/watchdog/sp805_wdt.c
index
c1b03f4
..
01d8162
100644
(file)
--- a/
kernel/drivers/watchdog/sp805_wdt.c
+++ b/
kernel/drivers/watchdog/sp805_wdt.c
@@
-4,7
+4,7
@@
* Watchdog driver for ARM SP805 watchdog module
*
* Copyright (C) 2010 ST Microelectronics
* Watchdog driver for ARM SP805 watchdog module
*
* Copyright (C) 2010 ST Microelectronics
- * Viresh Kumar <viresh
.linux@gmail.com
>
+ * Viresh Kumar <viresh
k@kernel.org
>
*
* This file is licensed under the terms of the GNU General Public
* License version 2 or later. This program is licensed "as is" without any
*
* This file is licensed under the terms of the GNU General Public
* License version 2 or later. This program is licensed "as is" without any
@@
-226,6
+226,7
@@
sp805_wdt_probe(struct amba_device *adev, const struct amba_id *id)
wdt->adev = adev;
wdt->wdd.info = &wdt_info;
wdt->wdd.ops = &wdt_ops;
wdt->adev = adev;
wdt->wdd.info = &wdt_info;
wdt->wdd.ops = &wdt_ops;
+ wdt->wdd.parent = &adev->dev;
spin_lock_init(&wdt->lock);
watchdog_set_nowayout(&wdt->wdd, nowayout);
spin_lock_init(&wdt->lock);
watchdog_set_nowayout(&wdt->wdd, nowayout);
@@
-303,6
+304,6
@@
static struct amba_driver sp805_wdt_driver = {
module_amba_driver(sp805_wdt_driver);
module_amba_driver(sp805_wdt_driver);
-MODULE_AUTHOR("Viresh Kumar <viresh
.linux@gmail.com
>");
+MODULE_AUTHOR("Viresh Kumar <viresh
k@kernel.org
>");
MODULE_DESCRIPTION("ARM SP805 Watchdog Driver");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("ARM SP805 Watchdog Driver");
MODULE_LICENSE("GPL");