Commit 19fbf677 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull HID fixes from Jiri Kosina:

 - power management fix for intel-ish-hid (Srinivas Pandruvada)

 - power management fix for hid-nintendo (Martino Fontana)

 - error handling fixes for nvidia-shield (Christophe JAILLET)

 - memory leak fix for hid-sony (Christophe JAILLET)

 - fix for slab out-of-bound write in hid-holtek (Ma Ke)

 - other assorted smaller fixes and device ID / quirk entry additions

* tag 'for-linus-2023100502' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
  HID: Add quirk to ignore the touchscreen battery on HP ENVY 15-eu0556ng
  HID: intel-ish-hid: ipc: Disable and reenable ACPI GPE bit
  HID: sony: remove duplicate NULL check before calling usb_free_urb()
  HID: nintendo: reinitialize USB Pro Controller after resuming from suspend
  HID: nvidia-shield: Fix some missing function calls() in the probe error handling path
  HID: nvidia-shield: Fix a missing led_classdev_unregister() in the probe error handling path
  HID: multitouch: Add required quirk for Synaptics 0xcd7e device
  HID: nvidia-shield: Select POWER_SUPPLY Kconfig option
  HID: holtek: fix slab-out-of-bounds Write in holtek_kbd_input_event
  HID: nvidia-shield: add LEDS_CLASS dependency
  HID: logitech-hidpp: Add Bluetooth ID for the Logitech M720 Triathlon mouse
  HID: steelseries: Fix signedness bug in steelseries_headset_arctis_1_fetch_battery()
  HID: sony: Fix a potential memory leak in sony_probe()
parents f291209e b009aa38

drivers/hid/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -799,6 +799,8 @@ config HID_NVIDIA_SHIELD 
	tristate "NVIDIA SHIELD devices"

	depends on USB_HID

	depends on BT_HIDP

	depends on LEDS_CLASS

	select POWER_SUPPLY

	help

	  Support for NVIDIA SHIELD accessories.

drivers/hid/hid-holtek-kbd.c

+4 −0
Original line number Diff line number Diff line
@@ -130,6 +130,10 @@ static int holtek_kbd_input_event(struct input_dev *dev, unsigned int type, 
		return -ENODEV;



	boot_hid = usb_get_intfdata(boot_interface);

	if (list_empty(&boot_hid->inputs)) {

		hid_err(hid, "no inputs found\n");

		return -ENODEV;

	}

	boot_hid_input = list_first_entry(&boot_hid->inputs,

		struct hid_input, list);

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -425,6 +425,7 @@ 
#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 I2C_DEVICE_ID_HP_ENVY_X360_15_EU0556NG		0x2D02



#define USB_VENDOR_ID_ELECOM		0x056e

#define USB_DEVICE_ID_ELECOM_BM084	0x0061

drivers/hid/hid-input.c

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

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_SPECTRE_X360_14T_EA100_V2),

	  HID_BATTERY_QUIRK_IGNORE },

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_ENVY_X360_15_EU0556NG),

	  HID_BATTERY_QUIRK_IGNORE },

	{}

};

drivers/hid/hid-logitech-hidpp.c

+2 −0
Original line number Diff line number Diff line
@@ -4677,6 +4677,8 @@ static const struct hid_device_id hidpp_devices[] = { 
	  HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, 0xb008) },

	{ /* MX Master mouse over Bluetooth */

	  HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, 0xb012) },

	{ /* M720 Triathlon mouse over Bluetooth */

	  HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, 0xb015) },

	{ /* MX Ergo trackball over Bluetooth */

	  HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, 0xb01d) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, 0xb01e) },