Commit de466448 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull HID fixes from Jiri Kosina:

 - kernel panic fix for intel-ish-hid driver (Tanu Malhotra)

 - buffer overflow fix in hid-sensor-custom driver (Todd Brandt)

 - two device specific quirks (Alessandro Manca, Philippe Troin)

* tag 'for-linus-2023041201' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
  HID: intel-ish-hid: Fix kernel panic during warm reset
  HID: hid-sensor-custom: Fix buffer overrun in device name
  HID: topre: Add support for 87 keys Realforce R2
  HID: add HP 13t-aw100 & 14t-ea100 digitizer battery quirks
parents b05e0f5e 38518593

drivers/hid/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1122,7 +1122,7 @@ config HID_TOPRE 
	tristate "Topre REALFORCE keyboards"

	depends on HID

	help

	  Say Y for N-key rollover support on Topre REALFORCE R2 108 key keyboards.

	  Say Y for N-key rollover support on Topre REALFORCE R2 108/87 key keyboards.



config HID_THINGM

	tristate "ThingM blink(1) USB RGB LED"

drivers/hid/hid-ids.h

+4 −0
Original line number Diff line number Diff line
@@ -420,6 +420,9 @@ 
#define I2C_DEVICE_ID_SURFACE_GO_TOUCHSCREEN	0x261A

#define I2C_DEVICE_ID_SURFACE_GO2_TOUCHSCREEN	0x2A1C

#define I2C_DEVICE_ID_LENOVO_YOGA_C630_TOUCHSCREEN	0x279F

#define I2C_DEVICE_ID_HP_SPECTRE_X360_13T_AW100	0x29F5

#define I2C_DEVICE_ID_HP_SPECTRE_X360_14T_EA100_V1	0x2BED

#define I2C_DEVICE_ID_HP_SPECTRE_X360_14T_EA100_V2	0x2BEE



#define USB_VENDOR_ID_ELECOM		0x056e

#define USB_DEVICE_ID_ELECOM_BM084	0x0061
@@ -1249,6 +1252,7 @@ 


#define USB_VENDOR_ID_TOPRE			0x0853

#define USB_DEVICE_ID_TOPRE_REALFORCE_R2_108			0x0148

#define USB_DEVICE_ID_TOPRE_REALFORCE_R2_87			0x0146



#define USB_VENDOR_ID_TOPSEED		0x0766

#define USB_DEVICE_ID_TOPSEED_CYBERLINK	0x0204

drivers/hid/hid-input.c

+6 −0
Original line number Diff line number Diff line
@@ -398,6 +398,12 @@ static const struct hid_device_id hid_battery_quirks[] = { 
	  HID_BATTERY_QUIRK_IGNORE },

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_LENOVO_YOGA_C630_TOUCHSCREEN),

	  HID_BATTERY_QUIRK_IGNORE },

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_SPECTRE_X360_13T_AW100),

	  HID_BATTERY_QUIRK_IGNORE },

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_SPECTRE_X360_14T_EA100_V1),

	  HID_BATTERY_QUIRK_IGNORE },

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_SPECTRE_X360_14T_EA100_V2),

	  HID_BATTERY_QUIRK_IGNORE },

	{}

};

drivers/hid/hid-sensor-custom.c

+1 −1
Original line number Diff line number Diff line
@@ -940,7 +940,7 @@ hid_sensor_register_platform_device(struct platform_device *pdev, 
				    struct hid_sensor_hub_device *hsdev,

				    const struct hid_sensor_custom_match *match)

{

	char real_usage[HID_SENSOR_USAGE_LENGTH];

	char real_usage[HID_SENSOR_USAGE_LENGTH] = { 0 };

	struct platform_device *custom_pdev;

	const char *dev_name;

	char *c;

drivers/hid/hid-topre.c

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ static __u8 *topre_report_fixup(struct hid_device *hdev, __u8 *rdesc, 
static const struct hid_device_id topre_id_table[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_TOPRE,

			 USB_DEVICE_ID_TOPRE_REALFORCE_R2_108) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TOPRE,

			 USB_DEVICE_ID_TOPRE_REALFORCE_R2_87) },

	{ }

};

MODULE_DEVICE_TABLE(hid, topre_id_table);