Merge branch 'fixes-rc1' into omap-for-v4.3/fixes

[firefly-linux-kernel-4.4.55.git] / drivers / watchdog / intel-mid_wdt.c

diff --git a/drivers/watchdog/intel-mid_wdt.c b/drivers/watchdog/intel-mid_wdt.c
index ca66e8e746357ecc71fad77e2d565afdd087079b..0a436b5d1e8444efed12ad7ce3f5b3eb5d4f0930 100644 (file)
--- a/drivers/watchdog/intel-mid_wdt.c
+++ b/drivers/watchdog/intel-mid_wdt.c
@@ -137,6 +137,7 @@ static int mid_wdt_probe(struct platform_device *pdev)
        wdt_dev->min_timeout = MID_WDT_TIMEOUT_MIN;
        wdt_dev->max_timeout = MID_WDT_TIMEOUT_MAX;
        wdt_dev->timeout = MID_WDT_DEFAULT_TIMEOUT;
+       wdt_dev->parent = &pdev->dev;
 
        watchdog_set_drvdata(wdt_dev, &pdev->dev);
        platform_set_drvdata(pdev, wdt_dev);
@@ -172,7 +173,6 @@ static struct platform_driver mid_wdt_driver = {
        .probe          = mid_wdt_probe,
        .remove         = mid_wdt_remove,
        .driver         = {
-               .owner  = THIS_MODULE,
                .name   = "intel_mid_wdt",
        },
 };