Commit 30dd4a8f authored May 06, 2015 by Michael Grzeschik Committed by Wim Van Sebroeck Jun 22, 2015

watchdog: imx2_wdt: also set wdog->timeout to new_timeout



Commit faad5de0 ("watchdog: imx2_wdt: convert to watchdog core api")
removes the custom ioctl function. The generic ioctl handler is not
setting the wdog->timeout to the new_timeout but handing this preset
value back to the userspace. This patch sets the new value in the
drivers set_timeout function to fix that problem.

Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

parent 21a926a3

drivers/watchdog/imx2_wdt.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -166,6 +166,8 @@ static int imx2_wdt_set_timeout(struct watchdog_device *wdog,
		{
		struct imx2_wdt_device *wdev = watchdog_get_drvdata(wdog);

		wdog->timeout = new_timeout;

		regmap_update_bits(wdev->regmap, IMX2_WDT_WCR, IMX2_WDT_WCR_WT,
		WDOG_SEC_TO_COUNT(new_timeout));
		return 0;