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

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

Pull HID fixes from Jiri Kosina:

 - regression fix / revert of a commit that intended to reduce probing
   delay by ~50ms, but introduced a race that causes quite a few devices
   not to enumerate, or get stuck on first IRQ

 - buffer overflow fix in hiddev, from Peilin Ye

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
  Revert "HID: usbhid: do not sleep when opening device"
  HID: hiddev: Fix slab-out-of-bounds write in hiddev_ioctl_usage()
  HID: quirks: Always poll three more Lenovo PixArt mice
  HID: i2c-hid: Always sleep 60ms after I2C_HID_PWR_ON commands
  HID: macally: Constify macally_id_table
  HID: cougar: Constify cougar_id_table
parents 6a9dc5fd 5b0545dc

drivers/hid/hid-cougar.c

+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ static const struct kernel_param_ops cougar_g6_is_space_ops = { 
};

module_param_cb(g6_is_space, &cougar_g6_is_space_ops, &g6_is_space, 0644);



static struct hid_device_id cougar_id_table[] = {

static const struct hid_device_id cougar_id_table[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_SOLID_YEAR,

			 USB_DEVICE_ID_COUGAR_500K_GAMING_KEYBOARD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SOLID_YEAR,

drivers/hid/hid-ids.h

+3 −0
Original line number Diff line number Diff line
@@ -728,6 +728,9 @@ 
#define USB_DEVICE_ID_LENOVO_TPPRODOCK	0x6067

#define USB_DEVICE_ID_LENOVO_X1_COVER	0x6085

#define USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_608D	0x608d

#define USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_6019	0x6019

#define USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_602E	0x602e

#define USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_6093	0x6093



#define USB_VENDOR_ID_LG		0x1fd2

#define USB_DEVICE_ID_LG_MULTITOUCH	0x0064

drivers/hid/hid-macally.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ static __u8 *macally_report_fixup(struct hid_device *hdev, __u8 *rdesc, 
	return rdesc;

}



static struct hid_device_id macally_id_table[] = {

static const struct hid_device_id macally_id_table[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_SOLID_YEAR,

			 USB_DEVICE_ID_MACALLY_IKEY_KEYBOARD) },

	{ }

drivers/hid/hid-quirks.c

+3 −0
Original line number Diff line number Diff line
@@ -105,6 +105,9 @@ static const struct hid_device_id hid_quirks[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M406XE), HID_QUIRK_MULTI_INPUT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_PIXART_USB_OPTICAL_MOUSE_ID2), HID_QUIRK_ALWAYS_POLL },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_608D), HID_QUIRK_ALWAYS_POLL },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_6019), HID_QUIRK_ALWAYS_POLL },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_602E), HID_QUIRK_ALWAYS_POLL },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_6093), HID_QUIRK_ALWAYS_POLL },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_C007), HID_QUIRK_ALWAYS_POLL },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_C077), HID_QUIRK_ALWAYS_POLL },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_KEYBOARD_G710_PLUS), HID_QUIRK_NOGET },

drivers/hid/i2c-hid/i2c-hid-core.c

+13 −9
Original line number Diff line number Diff line
@@ -420,6 +420,19 @@ static int i2c_hid_set_power(struct i2c_client *client, int power_state) 
		dev_err(&client->dev, "failed to change power setting.\n");



set_pwr_exit:



	/*

	 * The HID over I2C specification states that if a DEVICE needs time

	 * after the PWR_ON request, it should utilise CLOCK stretching.

	 * However, it has been observered that the Windows driver provides a

	 * 1ms sleep between the PWR_ON and RESET requests.

	 * According to Goodix Windows even waits 60 ms after (other?)

	 * PWR_ON requests. Testing has confirmed that several devices

	 * will not work properly without a delay after a PWR_ON request.

	 */

	if (!ret && power_state == I2C_HID_PWR_ON)

		msleep(60);



	return ret;

}
@@ -441,15 +454,6 @@ static int i2c_hid_hwreset(struct i2c_client *client) 
	if (ret)

		goto out_unlock;



	/*

	 * The HID over I2C specification states that if a DEVICE needs time

	 * after the PWR_ON request, it should utilise CLOCK stretching.

	 * However, it has been observered that the Windows driver provides a

	 * 1ms sleep between the PWR_ON and RESET requests and that some devices

	 * rely on this.

	 */

	usleep_range(1000, 5000);



	i2c_hid_dbg(ihid, "resetting...\n");



	ret = i2c_hid_command(client, &hid_reset_cmd, NULL, 0);

CRA Git | Maintained and supported by SUSTech CRA and CCSE