History

Merge tag 'input-for-v6.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input fixes from Dmitry Torokhov: - INPUT_PROP_HAPTIC_TOUCHPAD definition added early in 6.18 cycle has been renamed to INPUT_PROP_PRESSUREPAD to better reflect the kind of devices it is supposed to be set for - a new ID for a touchscreen found in Ayaneo Flip DS in Goodix driver - Goodix driver no longer tries to set reset pin as "input" as it causes issues when there is no pull up resistor installed on the board - fixes for cros_ec_keyb, imx_sc_key, and pegasus-notetaker drivers to deal with potential out-of-bounds access and memory corruption issues * tag 'input-for-v6.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: rename INPUT_PROP_HAPTIC_TOUCHPAD to INPUT_PROP_PRESSUREPAD Input: cros_ec_keyb - fix an invalid memory access Input: imx_sc_key - fix memory corruption on unload Input: pegasus-notetaker - fix potential out-of-bounds access Input: goodix - remove setting of RST pin to input Input: goodix - add support for ACPI ID GDIX1003

Linus Torvalds committed 11 months ago

Commit ebd97542 parents a6ff0d8 ae8966b8 files · +38 −37Browse files

Showing the changes to include/uapi/linux (1 of 8 files). Show all

Unified · Split

include/uapi/linux/input-event-codes.h+1−1
@@ -27,7 +27,7 @@ · 26 unmodified lines
2727 #define INPUT_PROP_TOPBUTTONPAD 0x04 /* softbuttons at top of pad */
2828 #define INPUT_PROP_POINTING_STICK 0x05 /* is a pointing stick */
2929 #define INPUT_PROP_ACCELEROMETER 0x06 /* has accelerometer */
30−#define INPUT_PROP_HAPTIC_TOUCHPAD 0x07 /* is a haptic touchpad */
30+#define INPUT_PROP_PRESSUREPAD 0x07 /* pressure triggers clicks */
3131
3232 #define INPUT_PROP_MAX 0x1f
3333 #define INPUT_PROP_CNT (INPUT_PROP_MAX + 1)