Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID updates from Jiri Kosina: - bounds checking fixes in logitech and roccat drivers, from Peter Wu and Dan Carpenter - double-kfree fix in i2c-hid driver on bus shutdown, from Mika Westerberg - a couple of various small driver fixes - a few device id additions * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: roccat: potential out of bounds in pyra_sysfs_write_settings() HID: Add a new id 0x501a for Genius MousePen i608X HID: logitech-hidpp: prefix the name with "Logitech" HID: logitech-hidpp: avoid unintended fall-through HID: Allow HID_BATTERY_STRENGTH to be enabled HID: i2c-hid: Do not free buffers in i2c_hid_stop() HID: add battery quirk for USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO keyboard HID: logitech-hidpp: check WTP report length HID: logitech-dj: check report length
Showing
- drivers/hid/Kconfig 2 additions, 1 deletiondrivers/hid/Kconfig
- drivers/hid/hid-core.c 1 addition, 0 deletionsdrivers/hid/hid-core.c
- drivers/hid/hid-ids.h 1 addition, 0 deletionsdrivers/hid/hid-ids.h
- drivers/hid/hid-input.c 3 additions, 0 deletionsdrivers/hid/hid-input.c
- drivers/hid/hid-kye.c 4 additions, 0 deletionsdrivers/hid/hid-kye.c
- drivers/hid/hid-logitech-dj.c 15 additions, 1 deletiondrivers/hid/hid-logitech-dj.c
- drivers/hid/hid-logitech-hidpp.c 41 additions, 0 deletionsdrivers/hid/hid-logitech-hidpp.c
- drivers/hid/hid-roccat-pyra.c 6 additions, 2 deletionsdrivers/hid/hid-roccat-pyra.c
- drivers/hid/i2c-hid/i2c-hid.c 0 additions, 5 deletionsdrivers/hid/i2c-hid/i2c-hid.c
- drivers/hid/usbhid/hid-quirks.c 1 addition, 0 deletionsdrivers/hid/usbhid/hid-quirks.c
Please register or sign in to comment