From: Jean Delvare Date: Mon, 10 Mar 2014 20:28:17 +0000 (+0100) Subject: watchdog: iTCO_wdt: Fix the parent device X-Git-Tag: MMI-PSA29.97-13-9~12507^2~5 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c90789baa8cec363093c5ec292c989b6f22d8f32;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git watchdog: iTCO_wdt: Fix the parent device 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 Reviewed-by: Guenter Roeck Signed-off-by: Wim Van Sebroeck --- diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c index 6532e7a260d8..0e6c0333f775 100644 --- a/drivers/watchdog/iTCO_wdt.c +++ b/drivers/watchdog/iTCO_wdt.c @@ -485,7 +485,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);