summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/jz4740_wdt.c
diff options
context:
space:
mode:
authorWim Van Sebroeck <wim@iguana.be>2012-02-29 20:20:58 +0100
committerWim Van Sebroeck <wim@iguana.be>2012-03-27 20:08:09 +0200
commit0197c1c49ef1ff386b2ebb6d3b0fc85a8e174b5c (patch)
tree266ad74d44c332e27eac61070f7287051035136f /drivers/watchdog/jz4740_wdt.c
parentb10f7c12e051762b84457f6d38d4b71acbf76a02 (diff)
downloadop-kernel-dev-0197c1c49ef1ff386b2ebb6d3b0fc85a8e174b5c.zip
op-kernel-dev-0197c1c49ef1ff386b2ebb6d3b0fc85a8e174b5c.tar.gz
watchdog: fix set_timeout operations
Since we changed the behaviour of the set_timeout operation in the watchdog API, we need to change the allready converted drivers so that they update the timeout field at the end of the set_timeout operation. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/jz4740_wdt.c')
-rw-r--r--drivers/watchdog/jz4740_wdt.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/watchdog/jz4740_wdt.c b/drivers/watchdog/jz4740_wdt.c
index 28af416..978615e 100644
--- a/drivers/watchdog/jz4740_wdt.c
+++ b/drivers/watchdog/jz4740_wdt.c
@@ -109,6 +109,7 @@ static int jz4740_wdt_set_timeout(struct watchdog_device *wdt_dev,
writeb(0x1, drvdata->base + JZ_REG_WDT_COUNTER_ENABLE);
+ wdt_dev->timeout = new_timeout;
return 0;
}
OpenPOWER on IntegriCloud