diff options
| author | Michael Grzeschik <m.grzeschik@pengutronix.de> | 2015-05-06 13:17:59 +0200 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2015-06-22 15:54:25 +0200 |
| commit | 30dd4a8f08b570b5ed978fd937fdb5c31194be41 (patch) | |
| tree | 974ec1b460814ab124ec4507bb8a100483b4f87d /drivers/watchdog | |
| parent | watchdog: Allow compile test of GPIO consumers if !GPIOLIB (diff) | |
| download | linux-30dd4a8f08b570b5ed978fd937fdb5c31194be41.tar.xz linux-30dd4a8f08b570b5ed978fd937fdb5c31194be41.zip | |
watchdog: imx2_wdt: also set wdog->timeout to new_timeout
Commit faad5de0b104 ("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>
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/imx2_wdt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c index 5e6d808d358a..7cee4024ebfb 100644 --- a/drivers/watchdog/imx2_wdt.c +++ b/drivers/watchdog/imx2_wdt.c @@ -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; |