diff options
author | Dale Farnsworth <dale@farnsworth.org> | 2007-07-24 14:14:21 -0400 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2007-07-24 17:16:09 -0400 |
commit | 264f09915a6ad9e274abd027459232881742cb1a (patch) | |
tree | 67bcd05b75ef6ef36bbdd94a8bea55b6f66b3db1 /drivers/char/watchdog/mv64x60_wdt.c | |
parent | 861e5137708be1a7988f024a09d81c2f6accfb75 (diff) |
[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/mv64x60_wdt.c')
-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, | |||
118 | static int mv64x60_wdt_ioctl(struct inode *inode, struct file *file, | 118 | static int mv64x60_wdt_ioctl(struct inode *inode, struct file *file, |
119 | unsigned int cmd, unsigned long arg) | 119 | unsigned int cmd, unsigned long arg) |
120 | { | 120 | { |
121 | int timeout; | ||
122 | void __user *argp = (void __user *)arg; | 121 | void __user *argp = (void __user *)arg; |
123 | static struct watchdog_info info = { | 122 | static struct watchdog_info info = { |
124 | .options = WDIOF_KEEPALIVEPING, | 123 | .options = WDIOF_KEEPALIVEPING, |
@@ -154,8 +153,7 @@ static int mv64x60_wdt_ioctl(struct inode *inode, struct file *file, | |||
154 | return -EOPNOTSUPP; | 153 | return -EOPNOTSUPP; |
155 | 154 | ||
156 | case WDIOC_GETTIMEOUT: | 155 | case WDIOC_GETTIMEOUT: |
157 | timeout = mv64x60_wdt_timeout * HZ; | 156 | if (put_user(mv64x60_wdt_timeout, (int __user *)argp)) |
158 | if (put_user(timeout, (int __user *)argp)) | ||
159 | return -EFAULT; | 157 | return -EFAULT; |
160 | break; | 158 | break; |
161 | 159 | ||