aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/s3c2410_wdt.c
diff options
context:
space:
mode:
authorWim Van Sebroeck <wim@iguana.be>2012-02-29 14:20:58 -0500
committerWim Van Sebroeck <wim@iguana.be>2012-03-27 14:08:09 -0400
commit0197c1c49ef1ff386b2ebb6d3b0fc85a8e174b5c (patch)
tree266ad74d44c332e27eac61070f7287051035136f /drivers/watchdog/s3c2410_wdt.c
parentb10f7c12e051762b84457f6d38d4b71acbf76a02 (diff)
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/s3c2410_wdt.c')
-rw-r--r--drivers/watchdog/s3c2410_wdt.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index 96b598c52dac..46c251d1893d 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -201,6 +201,8 @@ static int s3c2410wdt_set_heartbeat(struct watchdog_device *wdd, unsigned timeou
201 writel(count, wdt_base + S3C2410_WTDAT); 201 writel(count, wdt_base + S3C2410_WTDAT);
202 writel(wtcon, wdt_base + S3C2410_WTCON); 202 writel(wtcon, wdt_base + S3C2410_WTCON);
203 203
204 wdd->timeout = timeout;
205
204 return 0; 206 return 0;
205} 207}
206 208