Commit 763cf1f2 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:

 - fix for one corner case in HID++ protocol with respect to handling
   very long reports, from Hans de Goede

 - power management fix in Intel-ISH driver, from Hyungwoo Yang

 - use-after-free fix in Intel-ISH driver, from Dan Carpenter

 - a couple of new device IDs/quirks from Kai-Heng Feng, Kyle Godbey and
   Oleksandr Natalenko

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
  HID: intel-ish-hid: fix wrong driver_data usage
  HID: multitouch: Add pointstick support for ALPS Touchpad
  HID: logitech-dj: Fix forwarding of very long HID++ reports
  HID: uclogic: Add support for Huion HS64 tablet
  HID: chicony: add another quirk for PixArt mouse
  HID: intel-ish-hid: Fix a use after free in load_fw_from_host()
parents fe2da896 b12bbdc5

drivers/hid/hid-ids.h

+3 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ 
#define HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP	0x1220

#define HID_DEVICE_ID_ALPS_U1		0x1215

#define HID_DEVICE_ID_ALPS_T4_BTNLESS	0x120C

#define HID_DEVICE_ID_ALPS_1222		0x1222





#define USB_VENDOR_ID_AMI		0x046b
@@ -269,6 +270,7 @@ 
#define USB_DEVICE_ID_CHICONY_MULTI_TOUCH	0xb19d

#define USB_DEVICE_ID_CHICONY_WIRELESS	0x0618

#define USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE	0x1053

#define USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE2	0x0939

#define USB_DEVICE_ID_CHICONY_WIRELESS2	0x1123

#define USB_DEVICE_ID_ASUS_AK1D		0x1125

#define USB_DEVICE_ID_CHICONY_TOSHIBA_WT10A	0x1408
@@ -569,6 +571,7 @@ 


#define USB_VENDOR_ID_HUION		0x256c

#define USB_DEVICE_ID_HUION_TABLET	0x006e

#define USB_DEVICE_ID_HUION_HS64	0x006d



#define USB_VENDOR_ID_IBM					0x04b3

#define USB_DEVICE_ID_IBM_SCROLLPOINT_III			0x3100

drivers/hid/hid-logitech-dj.c

+3 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 


#define REPORT_ID_HIDPP_SHORT			0x10

#define REPORT_ID_HIDPP_LONG			0x11

#define REPORT_ID_HIDPP_VERY_LONG		0x12



#define HIDPP_REPORT_SHORT_LENGTH		7

#define HIDPP_REPORT_LONG_LENGTH		20
@@ -1242,7 +1243,8 @@ static int logi_dj_ll_raw_request(struct hid_device *hid, 
	int ret;



	if ((buf[0] == REPORT_ID_HIDPP_SHORT) ||

	    (buf[0] == REPORT_ID_HIDPP_LONG)) {

	    (buf[0] == REPORT_ID_HIDPP_LONG) ||

	    (buf[0] == REPORT_ID_HIDPP_VERY_LONG)) {

		if (count < 2)

			return -EINVAL;

drivers/hid/hid-multitouch.c

+4 −0
Original line number Diff line number Diff line
@@ -1776,6 +1776,10 @@ static const struct hid_device_id mt_devices[] = { 
		HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,

			USB_VENDOR_ID_ALPS_JP,

			HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP) },

	{ .driver_data = MT_CLS_WIN_8_DUAL,

		HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,

			USB_VENDOR_ID_ALPS_JP,

			HID_DEVICE_ID_ALPS_1222) },



	/* Lenovo X1 TAB Gen 2 */

	{ .driver_data = MT_CLS_WIN_8_DUAL,

drivers/hid/hid-quirks.c

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ static const struct hid_device_id hid_quirks[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_UC100KM), HID_QUIRK_NOGET },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_MULTI_TOUCH), HID_QUIRK_MULTI_INPUT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE), HID_QUIRK_ALWAYS_POLL },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE2), HID_QUIRK_ALWAYS_POLL },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS), HID_QUIRK_MULTI_INPUT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHIC, USB_DEVICE_ID_CHIC_GAMEPAD), HID_QUIRK_BADPAD },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_3AXIS_5BUTTON_STICK), HID_QUIRK_NOGET },

drivers/hid/hid-uclogic-core.c

+2 −0
Original line number Diff line number Diff line
@@ -369,6 +369,8 @@ static const struct hid_device_id uclogic_devices[] = { 
				USB_DEVICE_ID_UCLOGIC_TABLET_TWHA60) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_HUION,

				USB_DEVICE_ID_HUION_TABLET) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_HUION,

				USB_DEVICE_ID_HUION_HS64) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC,

				USB_DEVICE_ID_HUION_TABLET) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC,

CRA Git | Maintained and supported by SUSTech CRA and CCSE