Pull input subsystem fixes from Dmitry Torokhov. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: uinput - fix ioctl nr overflow for UI_GET_SYSNAME/VERSION Input: I8042 - add Acer Aspire 7738 to the nomux list Input: elantech - support new ICs types for version 4 Input: i8042 - reset keyboard to fix Elantech touchpad detection MAINTAINERS: remove Dmitry Torokhov's alternate address
Showing the changes to include/uapi/linux (1 of 6 files). Show all
Unified · Split
| @@ -82,7 +82,7 @@ struct uinput_ff_erase { · 81 unmodified lines | ||
| 82 | 82 | * The complete sysfs path is then /sys/devices/virtual/input/--NAME-- |
| 83 | 83 | * Usually, it is in the form "inputN" |
| 84 | 84 | */ |
| 85 | −#define UI_GET_SYSNAME(len) _IOC(_IOC_READ, UINPUT_IOCTL_BASE, 300, len) | |
| 85 | +#define UI_GET_SYSNAME(len) _IOC(_IOC_READ, UINPUT_IOCTL_BASE, 44, len) | |
| 86 | 86 | |
| 87 | 87 | /** |
| 88 | 88 | * UI_GET_VERSION - Return version of uinput protocol |
| @@ -91,7 +91,7 @@ struct uinput_ff_erase { · 2 unmodified lines | ||
| 91 | 91 | * the integer pointed to by the ioctl argument. The protocol version |
| 92 | 92 | * is hard-coded in the kernel and is independent of the uinput device. |
| 93 | 93 | */ |
| 94 | −#define UI_GET_VERSION _IOR(UINPUT_IOCTL_BASE, 301, unsigned int) | |
| 94 | +#define UI_GET_VERSION _IOR(UINPUT_IOCTL_BASE, 45, unsigned int) | |
| 95 | 95 | |
| 96 | 96 | /* |
| 97 | 97 | * To write a force-feedback-capable driver, the upload_effect |