aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Shiyan <shc_work@mail.ru>2014-02-15 13:23:25 +0400
committerWim Van Sebroeck <wim@iguana.be>2014-03-31 13:28:20 +0200
commit70605d9bab216534a593f3ec8218ab8c015cb452 (patch)
tree1e2247f211644300a15992831a07c66518fc8d38
parent1cf8a3487d385b3221d07ab6a7a003761e8806c1 (diff)
downloadlinux-70605d9bab216534a593f3ec8218ab8c015cb452.tar.gz
watchdog: wdt285: Fix variable type
Variable "new_margin" is checked in the function watchdog_ioctl() to be non-negative, so change its type to "int". Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
-rw-r--r--drivers/watchdog/wdt285.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/watchdog/wdt285.c b/drivers/watchdog/wdt285.c
index 7355ddd0b2073b..ebbb183be6182f 100644
--- a/drivers/watchdog/wdt285.c
+++ b/drivers/watchdog/wdt285.c
@@ -139,9 +139,8 @@ static const struct watchdog_info ident = {
static long watchdog_ioctl(struct file *file, unsigned int cmd,
unsigned long arg)
{
- unsigned int new_margin;
int __user *int_arg = (int __user *)arg;
- int ret = -ENOTTY;
+ int new_margin, ret = -ENOTTY;
switch (cmd) {
case WDIOC_GETSUPPORT: