Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be281588 authored by Guenter Roeck's avatar Guenter Roeck Committed by Wim Van Sebroeck
Browse files

watchdog: w83627hf_wdt: Add early_disable module parameter 



Add early_disable module parameter to match functionality previously
available in the w83697hf_wdt driver.

Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent ebc5e336

drivers/watchdog/w83627hf_wdt.c

+12 −3
Original line number Diff line number Diff line
@@ -64,6 +64,10 @@ MODULE_PARM_DESC(nowayout, 
		"Watchdog cannot be stopped once started (default="

				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");



static int early_disable;

module_param(early_disable, int, 0);

MODULE_PARM_DESC(early_disable, "Disable watchdog at boot time (default=0)");



/*

 *	Kernel methods.

 */
@@ -208,10 +212,15 @@ static int w83627hf_init(struct watchdog_device *wdog, enum chips chip) 


	t = superio_inb(cr_wdt_timeout);

	if (t != 0) {

		if (early_disable) {

			pr_warn("Stopping previously enabled watchdog until userland kicks in\n");

			superio_outb(cr_wdt_timeout, 0);

		} else {

			pr_info("Watchdog already running. Resetting timeout to %d sec\n",

				wdog->timeout);

			superio_outb(cr_wdt_timeout, wdog->timeout);

		}

	}



	/* set second mode & disable keyboard turning off watchdog */

	t = superio_inb(cr_wdt_control) & ~0x0C;