iwlwifi: mvm: synchronize TID queue removal

[mirror_ubuntu-bionic-kernel.git] / drivers / watchdog / sama5d4_wdt.c

diff --git a/drivers/watchdog/sama5d4_wdt.c b/drivers/watchdog/sama5d4_wdt.c
index 0ae947c3d7bcb10a1e8caae89b065e5bdf1de45f..f5ac54b69e576362b0689cc127ed323b342e7291 100644 (file)
--- a/drivers/watchdog/sama5d4_wdt.c
+++ b/drivers/watchdog/sama5d4_wdt.c
@@ -111,9 +111,7 @@ static int sama5d4_wdt_set_timeout(struct watchdog_device *wdd,
        u32 value = WDT_SEC2TICKS(timeout);
 
        wdt->mr &= ~AT91_WDT_WDV;
-       wdt->mr &= ~AT91_WDT_WDD;
        wdt->mr |= AT91_WDT_SET_WDV(value);
-       wdt->mr |= AT91_WDT_SET_WDD(value);
 
        /*
         * WDDIS has to be 0 when updating WDD/WDV. The datasheet states: When
@@ -247,15 +245,11 @@ static int sama5d4_wdt_probe(struct platform_device *pdev)
                }
        }
 
-       ret = watchdog_init_timeout(wdd, wdt_timeout, &pdev->dev);
-       if (ret) {
-               dev_err(&pdev->dev, "unable to set timeout value\n");
-               return ret;
-       }
+       watchdog_init_timeout(wdd, wdt_timeout, &pdev->dev);
 
        timeout = WDT_SEC2TICKS(wdd->timeout);
 
-       wdt->mr |= AT91_WDT_SET_WDD(timeout);
+       wdt->mr |= AT91_WDT_SET_WDD(WDT_SEC2TICKS(MAX_WDT_TIMEOUT));
        wdt->mr |= AT91_WDT_SET_WDV(timeout);
 
        ret = sama5d4_wdt_init(wdt);