From 29ae6f3d1ca3b774ec1a4a51a642af5c5e2e9b5b Mon Sep 17 00:00:00 2001
From: Dale Farnsworth <dale@farnsworth.org>
Date: Tue, 24 Jul 2007 11:14:21 -0700
Subject: [PATCH] --- yaml --- r: 63515 b: refs/heads/master c:
 264f09915a6ad9e274abd027459232881742cb1a h: refs/heads/master i:   63513:
 ed6a1f3fc911e40e8a27a3491cd8b9a9759d26dd   63511:
 c3749623db5aceb2944a44d5aac0774a6d491c69 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/char/watchdog/mv64x60_wdt.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 7fdce6bcee8e..1b9604074028 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 861e5137708be1a7988f024a09d81c2f6accfb75
+refs/heads/master: 264f09915a6ad9e274abd027459232881742cb1a
diff --git a/trunk/drivers/char/watchdog/mv64x60_wdt.c b/trunk/drivers/char/watchdog/mv64x60_wdt.c
index f1516b4b22a1..420c7b82f4ca 100644
--- a/trunk/drivers/char/watchdog/mv64x60_wdt.c
+++ b/trunk/drivers/char/watchdog/mv64x60_wdt.c
@@ -118,7 +118,6 @@ static ssize_t mv64x60_wdt_write(struct file *file, const char __user *data,
 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 @@ static int mv64x60_wdt_ioctl(struct inode *inode, struct file *file,
 		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;