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 e5b4e9bfbdc5..0727b0a12557 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c | |||
@@ -617,7 +617,7 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd, | |||
617 | if (get_user(t, ip)) | 617 | if (get_user(t, ip)) |
618 | return -EFAULT; | 618 | return -EFAULT; |
619 | 619 | ||
620 | error = dev->getkeycode(dev, t, &v); | 620 | error = input_get_keycode(dev, t, &v); |
621 | if (error) | 621 | if (error) |
622 | return error; | 622 | return error; |
623 | 623 | ||
@@ -630,7 +630,7 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd, | |||
630 | if (get_user(t, ip) || get_user(v, ip + 1)) | 630 | if (get_user(t, ip) || get_user(v, ip + 1)) |
631 | return -EFAULT; | 631 | return -EFAULT; |
632 | 632 | ||
633 | return dev->setkeycode(dev, t, v); | 633 | return input_set_keycode(dev, t, v); |
634 | 634 | ||
635 | case EVIOCSFF: | 635 | case EVIOCSFF: |
636 | if (copy_from_user(&effect, p, sizeof(effect))) | 636 | if (copy_from_user(&effect, p, sizeof(effect))) |
@@ -683,7 +683,7 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd, | |||
683 | case EV_FF: bits = dev->ffbit; len = FF_MAX; break; | 683 | case EV_FF: bits = dev->ffbit; len = FF_MAX; break; |
684 | case EV_SW: bits = dev->swbit; len = SW_MAX; break; | 684 | case EV_SW: bits = dev->swbit; len = SW_MAX; break; |
685 | default: return -EINVAL; | 685 | default: return -EINVAL; |
686 | } | 686 | } |
687 | return bits_to_user(bits, len, _IOC_SIZE(cmd), p, compat_mode); | 687 | return bits_to_user(bits, len, _IOC_SIZE(cmd), p, compat_mode); |
688 | } | 688 | } |
689 | 689 | ||