Merge tag 'iio-fixes-for-4.17a' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / drivers / watchdog / sama5d4_wdt.c

diff --git a/drivers/watchdog/sama5d4_wdt.c b/drivers/watchdog/sama5d4_wdt.c
index 0ae947c3d7bcb10a1e8caae89b065e5bdf1de45f..255169916dbb66e6470489141d385485cf3db91c 100644 (file)
--- a/drivers/watchdog/sama5d4_wdt.c
+++ b/drivers/watchdog/sama5d4_wdt.c
@@ -33,7 +33,7 @@ struct sama5d4_wdt {
        unsigned long           last_ping;
 };
 
-static int wdt_timeout = WDT_DEFAULT_TIMEOUT;
+static int wdt_timeout;
 static bool nowayout = WATCHDOG_NOWAYOUT;
 
 module_param(wdt_timeout, int, 0);
@@ -212,7 +212,7 @@ static int sama5d4_wdt_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        wdd = &wdt->wdd;
-       wdd->timeout = wdt_timeout;
+       wdd->timeout = WDT_DEFAULT_TIMEOUT;
        wdd->info = &sama5d4_wdt_info;
        wdd->ops = &sama5d4_wdt_ops;
        wdd->min_timeout = MIN_WDT_TIMEOUT;
@@ -273,7 +273,7 @@ static int sama5d4_wdt_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, wdt);
 
        dev_info(&pdev->dev, "initialized (timeout = %d sec, nowayout = %d)\n",
-                wdt_timeout, nowayout);
+                wdd->timeout, nowayout);
 
        return 0;
 }