From dbfbce76734f0a2e8820ae34ddb61e74312a501d Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 11 May 2012 12:00:27 +0200 Subject: [PATCH] --- yaml --- r: 305889 b: refs/heads/master c: 5f2430f554aabb4810b2a6f906be571ac1241d96 h: refs/heads/master i: 305887: a89f2b30f88e4cc483c288b1f8c4aecae1918fc4 v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/s3c2410_wdt.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7e64efb862b3..e855087384c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: abcf834b80eefb2ded56254ce7de94d2ab258d22 +refs/heads/master: 5f2430f554aabb4810b2a6f906be571ac1241d96 diff --git a/trunk/drivers/watchdog/s3c2410_wdt.c b/trunk/drivers/watchdog/s3c2410_wdt.c index d277cd614daf..200ece5e2a22 100644 --- a/trunk/drivers/watchdog/s3c2410_wdt.c +++ b/trunk/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; }