diff options
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/evdev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index 6cff8096d56a..0b45d475a1c6 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c | |||
@@ -512,7 +512,7 @@ static long evdev_ioctl_handler(struct file *file, unsigned int cmd, | |||
512 | 512 | ||
513 | if ((_IOC_NR(cmd) & ~EV_MAX) == _IOC_NR(EVIOCGBIT(0,0))) { | 513 | if ((_IOC_NR(cmd) & ~EV_MAX) == _IOC_NR(EVIOCGBIT(0,0))) { |
514 | 514 | ||
515 | long *bits; | 515 | unsigned long *bits; |
516 | int len; | 516 | int len; |
517 | 517 | ||
518 | switch (_IOC_NR(cmd) & EV_MAX) { | 518 | switch (_IOC_NR(cmd) & EV_MAX) { |
@@ -557,7 +557,7 @@ static long evdev_ioctl_handler(struct file *file, unsigned int cmd, | |||
557 | 557 | ||
558 | if ((_IOC_NR(cmd) & ~ABS_MAX) == _IOC_NR(EVIOCGABS(0))) { | 558 | if ((_IOC_NR(cmd) & ~ABS_MAX) == _IOC_NR(EVIOCGABS(0))) { |
559 | 559 | ||
560 | int t = _IOC_NR(cmd) & ABS_MAX; | 560 | t = _IOC_NR(cmd) & ABS_MAX; |
561 | 561 | ||
562 | abs.value = dev->abs[t]; | 562 | abs.value = dev->abs[t]; |
563 | abs.minimum = dev->absmin[t]; | 563 | abs.minimum = dev->absmin[t]; |
@@ -577,7 +577,7 @@ static long evdev_ioctl_handler(struct file *file, unsigned int cmd, | |||
577 | 577 | ||
578 | if ((_IOC_NR(cmd) & ~ABS_MAX) == _IOC_NR(EVIOCSABS(0))) { | 578 | if ((_IOC_NR(cmd) & ~ABS_MAX) == _IOC_NR(EVIOCSABS(0))) { |
579 | 579 | ||
580 | int t = _IOC_NR(cmd) & ABS_MAX; | 580 | t = _IOC_NR(cmd) & ABS_MAX; |
581 | 581 | ||
582 | if (copy_from_user(&abs, p, sizeof(struct input_absinfo))) | 582 | if (copy_from_user(&abs, p, sizeof(struct input_absinfo))) |
583 | return -EFAULT; | 583 | return -EFAULT; |