Merge tag 'mfd-for-linus-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

[mirror_ubuntu-artful-kernel.git] / drivers / watchdog / iTCO_wdt.c

diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
index 6d5928ffe604056a24157a3dc12a6d4df7708622..0ba1b7c997603e43fd24a99fc2e97f689f0515a9 100644 (file)
--- a/drivers/watchdog/iTCO_wdt.c
+++ b/drivers/watchdog/iTCO_wdt.c
@@ -370,15 +370,15 @@ static const struct watchdog_info ident = {
 static const struct watchdog_ops iTCO_wdt_ops = {
        .owner =                THIS_MODULE,
        .start =                iTCO_wdt_start,
-       .stop =                 iTCO_wdt_stop,
-       .ping =                 iTCO_wdt_ping,
+       .stop =                 iTCO_wdt_stop,
+       .ping =                 iTCO_wdt_ping,
        .set_timeout =          iTCO_wdt_set_timeout,
        .get_timeleft =         iTCO_wdt_get_timeleft,
 };
 
 static struct watchdog_device iTCO_wdt_watchdog_dev = {
        .info =         &ident,
-       .ops =          &iTCO_wdt_ops,
+       .ops =          &iTCO_wdt_ops,
 };
 
 /*
@@ -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);