commit 264f09915a6ad9e274abd027459232881742cb1a
author Dale Farnsworth <dale@farnsworth.org> Tue Jul 24 11:14:21 2007 -0700
committer Wim Van Sebroeck <wim@iguana.be> Tue Jul 24 21:16:09 2007 +0000
tree 67bcd05b75ef6ef36bbdd94a8bea55b6f66b3db1
parent 861e5137708be1a7988f024a09d81c2f6accfb75

[WATCHDOG] mv64x60_wdt: Fix WDIOC_GETTIMEOUT return value

WDIOC_GETTIMEOUT returns seconds, not jiffies.

Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

drivers/char/watchdog/mv64x60_wdt.c

diff --git a/drivers/char/watchdog/mv64x60_wdt.c b/drivers/char/watchdog/mv64x60_wdt.c
index f1516b4..420c7b8 100644
--- a/drivers/char/watchdog/mv64x60_wdt.c
+++ b/drivers/char/watchdog/mv64x60_wdt.c
@@ -118,7 +118,6 @@
 static int mv64x60_wdt_ioctl(struct inode *inode, struct file *file,
 			     unsigned int cmd, unsigned long arg)
 {
-	int timeout;
 	void __user *argp = (void __user *)arg;
 	static struct watchdog_info info = {
 		.options = WDIOF_KEEPALIVEPING,
@@ -154,8 +153,7 @@
 		return -EOPNOTSUPP;
 
 	case WDIOC_GETTIMEOUT:
-		timeout = mv64x60_wdt_timeout * HZ;
-		if (put_user(timeout, (int __user *)argp))
+		if (put_user(mv64x60_wdt_timeout, (int __user *)argp))
 			return -EFAULT;
 		break;