diff options
| author | Jean Delvare <jdelvare@suse.de> | 2014-11-05 09:39:21 +0800 |
|---|---|---|
| committer | Stephane Desneux <stephane.desneux@open.eurogiciel.org> | 2015-02-04 11:16:28 +0100 |
| commit | 3edfcbf0ac152990796bd6de75d88db123eca1a3 (patch) | |
| tree | 7c7e0442741c38ed34d8169ac8491f698b44b3b7 | |
| parent | 969fddf2181640b190eefa4b6885e4e080b7da83 (diff) | |
| download | kernel-common-3edfcbf0ac152990796bd6de75d88db123eca1a3.tar.gz kernel-common-3edfcbf0ac152990796bd6de75d88db123eca1a3.tar.bz2 kernel-common-3edfcbf0ac152990796bd6de75d88db123eca1a3.zip | |
watchdog: iTCO_wdt: Fix the parent devicev3.14.28+ltsiupstream
The watchdog's parent is iTCO_wdt (the platform device) not lpc_ich
(the PCI device.) Setting the parent right makes it much easier for
the user to figure out which driver/module is handling the watchdog
device node.
Signed-off-by: Jean Delvare <jdelvare@suse.de>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
(cherry picked from commit c90789baa8cec363093c5ec292c989b6f22d8f32)
Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
| -rw-r--r-- | drivers/watchdog/iTCO_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c index b0319ac1cec5..0ba1b7c99760 100644 --- a/drivers/watchdog/iTCO_wdt.c +++ b/drivers/watchdog/iTCO_wdt.c @@ -512,7 +512,7 @@ static int iTCO_wdt_probe(struct platform_device *dev) iTCO_wdt_watchdog_dev.bootstatus = 0; iTCO_wdt_watchdog_dev.timeout = WATCHDOG_TIMEOUT; watchdog_set_nowayout(&iTCO_wdt_watchdog_dev, nowayout); - iTCO_wdt_watchdog_dev.parent = dev->dev.parent; + iTCO_wdt_watchdog_dev.parent = &dev->dev; /* Make sure the watchdog is not running */ iTCO_wdt_stop(&iTCO_wdt_watchdog_dev); |