Merge pull request torvalds#179 in PROCESSOR-SDK/processor-sdk-linux …

…from plsdk-2981 to processor-sdk-linux-4.19.y * commit '58f166a466afea149fe9c1b35af630801f5effcc': watchdog: keystone_wdt: fix extra delay after watchdog is closed
chombourger · Aug 26, 2019 · a857438 · a857438
2 parents ad9e5c6 + 58f166a
commit a857438
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/drivers/watchdog/keystone_wdt.c b/drivers/watchdog/keystone_wdt.c
@@ -184,7 +184,7 @@ static int keystone_wdt_probe(struct platform_device *pdev)
 	wdd->min_timeout = 1;
 	/* Set min heartbeat to 1.1x window size */
 	wdd->min_hw_heartbeat_ms = 11 * DEFAULT_HEARTBEAT * 1000 / 20;
-	wdd->max_hw_heartbeat_ms = MAX_HEARTBEAT;
+	wdd->max_hw_heartbeat_ms = MAX_HEARTBEAT * 1000;
 	wdd->timeout = DEFAULT_HEARTBEAT;
 	wdd->parent = dev;