History

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid

Pull HID subsystem fixes from Jiri Kosina: - syzkaller-reported error handling fixes in various drivers, from various people - increase of HID report buffer size to 8K, which is apparently needed by certain modern devices - a few new device-ID-specific fixes / quirks - battery charging status reporting fix in logitech-hidpp, from Filipe Laíns * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid: HID: hid-bigbenff: fix race condition for scheduled work during removal HID: hid-bigbenff: call hid_hw_stop() in case of error HID: hid-bigbenff: fix general protection fault caused by double kfree HID: i2c-hid: add Trekstor Surfbook E11B to descriptor override HID: alps: Fix an error handling path in 'alps_input_configured()' HID: hiddev: Fix race in in hiddev_disconnect() HID: core: increase HID report buffer size to 8KiB HID: core: fix off-by-one memset in hid_report_raw_event() HID: apple: Add support for recent firmware on Magic Keyboards HID: ite: Only bind to keyboard USB interface on Acer SW5-012 keyboard dock HID: logitech-hidpp: BatteryVoltage: only read chargeStatus if extPower is active

Linus Torvalds committed 6 years ago

Commit 278de452 parents e46bfab 4eb1b019 files · +64 −36Browse files

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

Unified · Split

include/linux/hid.h+1−1
@@ -492,7 +492,7 @@ struct hid_report_enum { · 491 unmodified lines
492};492};
493 493
494#define HID_MIN_BUFFER_SIZE 64 /* make sure there is at least a packet size of space */494#define HID_MIN_BUFFER_SIZE 64 /* make sure there is at least a packet size of space */
495#define HID_MAX_BUFFER_SIZE 4096 /* 4kb */495#define HID_MAX_BUFFER_SIZE 8192 /* 8kb */
496#define HID_CONTROL_FIFO_SIZE 256 /* to init devices with >100 reports */496#define HID_CONTROL_FIFO_SIZE 256 /* to init devices with >100 reports */
497#define HID_OUTPUT_FIFO_SIZE 64497#define HID_OUTPUT_FIFO_SIZE 64
498 498