diff options
Diffstat (limited to 'drivers/input/evdev.c')
-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 be3dbc1ae67d..55a72592704c 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c | |||
@@ -511,7 +511,7 @@ static long evdev_ioctl_handler(struct file *file, unsigned int cmd, | |||
511 | 511 | ||
512 | if ((_IOC_NR(cmd) & ~EV_MAX) == _IOC_NR(EVIOCGBIT(0,0))) { | 512 | if ((_IOC_NR(cmd) & ~EV_MAX) == _IOC_NR(EVIOCGBIT(0,0))) { |
513 | 513 | ||
514 | long *bits; | 514 | unsigned long *bits; |
515 | int len; | 515 | int len; |
516 | 516 | ||
517 | switch (_IOC_NR(cmd) & EV_MAX) { | 517 | switch (_IOC_NR(cmd) & EV_MAX) { |
@@ -556,7 +556,7 @@ static long evdev_ioctl_handler(struct file *file, unsigned int cmd, | |||
556 | 556 | ||
557 | if ((_IOC_NR(cmd) & ~ABS_MAX) == _IOC_NR(EVIOCGABS(0))) { | 557 | if ((_IOC_NR(cmd) & ~ABS_MAX) == _IOC_NR(EVIOCGABS(0))) { |
558 | 558 | ||
559 | int t = _IOC_NR(cmd) & ABS_MAX; | 559 | t = _IOC_NR(cmd) & ABS_MAX; |
560 | 560 | ||
561 | abs.value = dev->abs[t]; | 561 | abs.value = dev->abs[t]; |
562 | abs.minimum = dev->absmin[t]; | 562 | abs.minimum = dev->absmin[t]; |
@@ -576,7 +576,7 @@ static long evdev_ioctl_handler(struct file *file, unsigned int cmd, | |||
576 | 576 | ||
577 | if ((_IOC_NR(cmd) & ~ABS_MAX) == _IOC_NR(EVIOCSABS(0))) { | 577 | if ((_IOC_NR(cmd) & ~ABS_MAX) == _IOC_NR(EVIOCSABS(0))) { |
578 | 578 | ||
579 | int t = _IOC_NR(cmd) & ABS_MAX; | 579 | t = _IOC_NR(cmd) & ABS_MAX; |
580 | 580 | ||
581 | if (copy_from_user(&abs, p, sizeof(struct input_absinfo))) | 581 | if (copy_from_user(&abs, p, sizeof(struct input_absinfo))) |
582 | return -EFAULT; | 582 | return -EFAULT; |