watchdog: wm8350_wdt: Fix handling WDIOS_DISABLECARD/WDIOS_ENABLECARD options (ebe06e82) · Commits · 戴 / test

While receiving WDIOS_DISABLECARD option for WDIOC_SETOPTIONS command, call wm8350_wdt_stop() to disable watchdog. Call wm8350_wdt_start() while receiving WDIOS_ENABLECARD option. Current code has reverse behavior. Signed-off-by:

Axel Lin <axel.lin@gmail.com> Acked-by:

Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by:

Wim Van Sebroeck <wim@iguana.be>

drivers/watchdog/wm8350_wdt.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -212,10 +212,10 @@ static long wm8350_wdt_ioctl(struct file *file, unsigned int cmd,

	/* Setting both simultaneously means at least one must fail */		/* Setting both simultaneously means at least one must fail */
	if (options == WDIOS_DISABLECARD)		if (options == WDIOS_DISABLECARD)
	ret = wm8350_wdt_start(wm8350);		ret = wm8350_wdt_stop(wm8350);

	if (options == WDIOS_ENABLECARD)		if (options == WDIOS_ENABLECARD)
	ret = wm8350_wdt_stop(wm8350);		ret = wm8350_wdt_start(wm8350);
	break;		break;
	}		}

Admin message