Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 525b8709 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull HID update from Jiri Kosina:

 - fixes for several bugs in incorrect allocations of buffers by David
   Herrmann and Benjamin Tissoires.

 - support for a few new device IDs by Archana Patni, Benjamin
   Tissoires, Huei-Horng Yo, Reyad Attiyat and Yufeng Shen

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: hyperv: make sure input buffer is big enough
  HID: Bluetooth: hidp: make sure input buffers are big enough
  HID: hid-sensor-hub: quirk for STM Sensor hub
  HID: apple: add Apple wireless keyboard 2011 JIS model support
  HID: fix buffer allocations
  HID: multitouch: add FocalTech FTxxxx support
  HID: microsoft: Add ID's for Surface Type/Touch Cover 2
  HID: usbhid: quirk for CY-TM75 75 inch Touch Overlay
parents b0d3f6d4 3ccfd0a8

drivers/hid/hid-apple.c

+3 −0
Original line number Diff line number Diff line
@@ -469,6 +469,9 @@ static const struct hid_device_id apple_devices[] = { 
	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,

				USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,

				USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_JIS),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI),

drivers/hid/hid-core.c

+3 −0
Original line number Diff line number Diff line
@@ -1679,6 +1679,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_JIS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_AUREAL, USB_DEVICE_ID_AUREAL_W01RN) },
@@ -1779,6 +1780,8 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1) },

drivers/hid/hid-hyperv.c

+8 −3
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ struct mousevsc_dev { 
	u32			report_desc_size;

	struct hv_input_dev_info hid_dev_info;

	struct hid_device       *hid_device;

	u8			input_buf[HID_MAX_BUFFER_SIZE];

};
@@ -256,6 +257,7 @@ static void mousevsc_on_receive(struct hv_device *device, 
	struct synthhid_msg *hid_msg;

	struct mousevsc_dev *input_dev = hv_get_drvdata(device);

	struct synthhid_input_report *input_report;

	size_t len;



	pipe_msg = (struct pipe_prt_msg *)((unsigned long)packet +

						(packet->offset8 << 3));
@@ -300,9 +302,12 @@ static void mousevsc_on_receive(struct hv_device *device, 
			(struct synthhid_input_report *)pipe_msg->data;

		if (!input_dev->init_complete)

			break;

		hid_input_report(input_dev->hid_device,

				HID_INPUT_REPORT, input_report->buffer,

				input_report->header.size, 1);



		len = min(input_report->header.size,

			  (u32)sizeof(input_dev->input_buf));

		memcpy(input_dev->input_buf, input_report->buffer, len);

		hid_input_report(input_dev->hid_device, HID_INPUT_REPORT,

				 input_dev->input_buf, len, 1);

		break;

	default:

		pr_err("unsupported hid msg type - type %d len %d",

drivers/hid/hid-ids.h

+8 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ 
#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS   0x023b

#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI  0x0255

#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO   0x0256

#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_JIS   0x0257

#define USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI	0x0290

#define USB_DEVICE_ID_APPLE_WELLSPRING8_ISO	0x0291

#define USB_DEVICE_ID_APPLE_WELLSPRING8_JIS	0x0292
@@ -240,6 +241,7 @@ 


#define USB_VENDOR_ID_CYGNAL		0x10c4

#define USB_DEVICE_ID_CYGNAL_RADIO_SI470X	0x818a

#define USB_DEVICE_ID_FOCALTECH_FTXXXX_MULTITOUCH	0x81b9



#define USB_DEVICE_ID_CYGNAL_RADIO_SI4713       0x8244
@@ -451,6 +453,9 @@ 
#define USB_VENDOR_ID_INTEL_1		0x8087

#define USB_DEVICE_ID_INTEL_HID_SENSOR	0x09fa



#define USB_VENDOR_ID_STM_0             0x0483

#define USB_DEVICE_ID_STM_HID_SENSOR    0x91d1



#define USB_VENDOR_ID_ION		0x15e4

#define USB_DEVICE_ID_ICADE		0x0132
@@ -619,6 +624,8 @@ 
#define USB_DEVICE_ID_MS_PRESENTER_8K_USB	0x0713

#define USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K	0x0730

#define USB_DEVICE_ID_MS_COMFORT_MOUSE_4500	0x076c

#define USB_DEVICE_ID_MS_TOUCH_COVER_2	0x07a7

#define USB_DEVICE_ID_MS_TYPE_COVER_2	0x07a9



#define USB_VENDOR_ID_MOJO		0x8282

#define USB_DEVICE_ID_RETRO_ADAPTER	0x3201
@@ -644,6 +651,7 @@ 


#define USB_VENDOR_ID_NEXIO		0x1870

#define USB_DEVICE_ID_NEXIO_MULTITOUCH_420	0x010d

#define USB_DEVICE_ID_NEXIO_MULTITOUCH_PTI0750	0x0110



#define USB_VENDOR_ID_NEXTWINDOW	0x1926

#define USB_DEVICE_ID_NEXTWINDOW_TOUCHSCREEN	0x0003

drivers/hid/hid-input.c

+1 −1
Original line number Diff line number Diff line
@@ -1178,7 +1178,7 @@ static void hidinput_led_worker(struct work_struct *work) 


	/* fall back to generic raw-output-report */

	len = ((report->size - 1) >> 3) + 1 + (report->id > 0);

	buf = kmalloc(len, GFP_KERNEL);

	buf = hid_alloc_report_buf(report, GFP_KERNEL);

	if (!buf)

		return;