summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2012-05-11 12:00:27 +0200
committerWim Van Sebroeck <wim@iguana.be>2012-05-23 16:26:20 +0200
commit5f2430f554aabb4810b2a6f906be571ac1241d96 (patch)
tree061e277f6d580d8d2cb77866669628838b5b3a29 /drivers/watchdog
parentabcf834b80eefb2ded56254ce7de94d2ab258d22 (diff)
downloadlinux-5f2430f554aabb4810b2a6f906be571ac1241d96.tar.gz
linux-5f2430f554aabb4810b2a6f906be571ac1241d96.tar.bz2
linux-5f2430f554aabb4810b2a6f906be571ac1241d96.zip
watchdog: s3c2410_wdt: Set timeout to actually achieved timeout
While rebasing my "watchdog_dev: Let the driver update the timeout field on set_timeout success" patch (before I noticed it was already picked up by Wim), I noticed that the s3c2410_wdt driver may not always have a 1 second resolution, this patch changes s3c2410wdt_set_heartbeat to update the timeout to the actually achieved timeout. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/s3c2410_wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index d277cd614daf..200ece5e2a22 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -202,7 +202,7 @@ static int s3c2410wdt_set_heartbeat(struct watchdog_device *wdd, unsigned timeou
writel(count, wdt_base + S3C2410_WTDAT);
writel(wtcon, wdt_base + S3C2410_WTCON);
- wdd->timeout = timeout;
+ wdd->timeout = (count * divisor) / freq;
return 0;
}