Commit 1c74a7f8 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 fixes from Jiri Kosina:

 - fix for how scaling linearization is computed in wiimote driver, by
   Cyan Ogilvie

 - endless retry loop fix in generic USB HID core reset-resume handling,
   by Alan Stern

 - two functional fixes affecting particular devices, and oops fix for
   wacom driver, by Jason Gerecke

 - multitouch slot numbering fix from Gabriele Mazzotta

 - a couple more small fixes on top

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: wacom: Support switching from vendor-defined device mode on G9 and G11
  HID: wacom: Initialize hid_data.inputmode to -1
  HID: microsoft: add support for 3 more devices
  HID: multitouch: Synchronize MT frame on reset_resume
  HID: wacom: fix Bamboo ONE oops
  HID: lenovo: Don't use stack variables for DMA buffers
  HID: usbhid: fix inconsistent reset/resume/reset-resume behavior
  HID: wiimote: Fix wiimote mp scale linearization
parents 6c6563a4 326ea2a9

drivers/hid/hid-core.c

+3 −0
Original line number Diff line number Diff line
@@ -1979,6 +1979,9 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_7K) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_600) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3KV1) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL) },

drivers/hid/hid-ids.h

+3 −0
Original line number Diff line number Diff line
@@ -676,6 +676,7 @@ 
#define USB_DEVICE_ID_SIDEWINDER_GV	0x003b

#define USB_DEVICE_ID_MS_OFFICE_KB	0x0048

#define USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0 0x009d

#define USB_DEVICE_ID_MS_DIGITAL_MEDIA_7K 0x00b4

#define USB_DEVICE_ID_MS_NE4K		0x00db

#define USB_DEVICE_ID_MS_NE4K_JP	0x00dc

#define USB_DEVICE_ID_MS_LK6K		0x00f9
@@ -683,6 +684,8 @@ 
#define USB_DEVICE_ID_MS_PRESENTER_8K_USB	0x0713

#define USB_DEVICE_ID_MS_NE7K		0x071d

#define USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K	0x0730

#define USB_DEVICE_ID_MS_DIGITAL_MEDIA_3KV1 0x0732

#define USB_DEVICE_ID_MS_DIGITAL_MEDIA_600  0x0750

#define USB_DEVICE_ID_MS_COMFORT_MOUSE_4500	0x076c

#define USB_DEVICE_ID_MS_COMFORT_KEYBOARD 0x00e3

#define USB_DEVICE_ID_MS_SURFACE_PRO_2   0x0799

drivers/hid/hid-lenovo.c

+13 −3
Original line number Diff line number Diff line
@@ -184,21 +184,31 @@ static int lenovo_send_cmd_cptkbd(struct hid_device *hdev, 
			unsigned char byte2, unsigned char byte3)

{

	int ret;

	unsigned char buf[] = {0x18, byte2, byte3};

	unsigned char *buf;



	buf = kzalloc(3, GFP_KERNEL);

	if (!buf)

		return -ENOMEM;



	buf[0] = 0x18;

	buf[1] = byte2;

	buf[2] = byte3;



	switch (hdev->product) {

	case USB_DEVICE_ID_LENOVO_CUSBKBD:

		ret = hid_hw_raw_request(hdev, 0x13, buf, sizeof(buf),

		ret = hid_hw_raw_request(hdev, 0x13, buf, 3,

					HID_FEATURE_REPORT, HID_REQ_SET_REPORT);

		break;

	case USB_DEVICE_ID_LENOVO_CBTKBD:

		ret = hid_hw_output_report(hdev, buf, sizeof(buf));

		ret = hid_hw_output_report(hdev, buf, 3);

		break;

	default:

		ret = -EINVAL;

		break;

	}



	kfree(buf);



	return ret < 0 ? ret : 0; /* BT returns 0, USB returns sizeof(buf) */

}

drivers/hid/hid-microsoft.c

+6 −0
Original line number Diff line number Diff line
@@ -272,6 +272,12 @@ static const struct hid_device_id ms_devices[] = { 
		.driver_data = MS_PRESENTER },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K),

		.driver_data = MS_ERGONOMY | MS_RDESC_3K },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_7K),

		.driver_data = MS_ERGONOMY },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_600),

		.driver_data = MS_ERGONOMY },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3KV1),

		.driver_data = MS_ERGONOMY },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0),

		.driver_data = MS_NOGET },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_MOUSE_4500),

drivers/hid/hid-multitouch.c

+1 −0
Original line number Diff line number Diff line
@@ -1169,6 +1169,7 @@ static void mt_release_contacts(struct hid_device *hid) 
							   MT_TOOL_FINGER,

							   false);

			}

			input_mt_sync_frame(input_dev);

			input_sync(input_dev);

		}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE