diff options
| author |   Dale Farnsworth <dale@farnsworth.org> | 2007-07-24 11:14:21 -0700 |
|---|---|---|
| committer |   Wim Van Sebroeck <wim@iguana.be> | 2007-07-24 21:16:09 +0000 |
| commit | 264f09915a6ad9e274abd027459232881742cb1a (patch) | |
| tree | 67bcd05b75ef6ef36bbdd94a8bea55b6f66b3db1 /drivers/char/watchdog | |
| parent | [WATCHDOG] mv64x60_wdt: Check return value of nonseekable_open (diff) | |
| download | linux-dev-264f09915a6ad9e274abd027459232881742cb1a.tar.xz linux-dev-264f09915a6ad9e274abd027459232881742cb1a.zip | |
[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>
Diffstat (limited to 'drivers/char/watchdog')
| -rw-r--r-- | 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 f1516b4b22a1..420c7b82f4ca 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; |