Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=264f09915a6ad9e274abd027459232881742cb1a
Commit:     264f09915a6ad9e274abd027459232881742cb1a
Parent:     861e5137708be1a7988f024a09d81c2f6accfb75
Author:     Dale Farnsworth <[EMAIL PROTECTED]>
AuthorDate: Tue Jul 24 11:14:21 2007 -0700
Committer:  Wim Van Sebroeck <[EMAIL PROTECTED]>
CommitDate: Tue Jul 24 21:16:09 2007 +0000

    [WATCHDOG] mv64x60_wdt: Fix WDIOC_GETTIMEOUT return value
    
    WDIOC_GETTIMEOUT returns seconds, not jiffies.
    
    Signed-off-by: Dale Farnsworth <[EMAIL PROTECTED]>
    Signed-off-by: Wim Van Sebroeck <[EMAIL PROTECTED]>
---
 drivers/char/watchdog/mv64x60_wdt.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

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 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;
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to