Commit f8966048 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 potential 3.9 regression in handling of buttons for touchpads
   following HID mt specification; potential because reportedly there is
   no retail product on the market that would be using this feature, but
   nevertheless we'd better follow the spec.  Fix by Benjamin Tissoires.

 - support for two quirky devices added by Josh Boyer.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: multitouch: fix touchpad buttons
  HID: usbhid: fix build problem
  HID: usbhid: quirk for MSI GX680R led panel
  HID: usbhid: quirk for Realtek Multi-card reader
parents a8c45289 4c437555

drivers/hid/hid-ids.h

+6 −0
Original line number Diff line number Diff line
@@ -590,6 +590,9 @@ 
#define USB_VENDOR_ID_MONTEREY		0x0566

#define USB_DEVICE_ID_GENIUS_KB29E	0x3004



#define USB_VENDOR_ID_MSI		0x1770

#define USB_DEVICE_ID_MSI_GX680R_LED_PANEL	0xff00



#define USB_VENDOR_ID_NATIONAL_SEMICONDUCTOR 0x0400

#define USB_DEVICE_ID_N_S_HARMONY	0xc359
@@ -684,6 +687,9 @@ 
#define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001		0x3001

#define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008		0x3008



#define USB_VENDOR_ID_REALTEK		0x0bda

#define USB_DEVICE_ID_REALTEK_READER	0x0152



#define USB_VENDOR_ID_ROCCAT		0x1e7d

#define USB_DEVICE_ID_ROCCAT_ARVO	0x30d4

#define USB_DEVICE_ID_ROCCAT_ISKU	0x319c

drivers/hid/hid-multitouch.c

+5 −1
Original line number Diff line number Diff line
@@ -621,6 +621,7 @@ static void mt_process_mt_event(struct hid_device *hid, struct hid_field *field, 
{

	struct mt_device *td = hid_get_drvdata(hid);

	__s32 quirks = td->mtclass.quirks;

	struct input_dev *input = field->hidinput->input;



	if (hid->claimed & HID_CLAIMED_INPUT) {

		switch (usage->hid) {
@@ -670,13 +671,16 @@ static void mt_process_mt_event(struct hid_device *hid, struct hid_field *field, 
			break;



		default:

			if (usage->type)

				input_event(input, usage->type, usage->code,

						value);

			return;

		}



		if (usage->usage_index + 1 == field->report_count) {

			/* we only take into account the last report. */

			if (usage->hid == td->last_slot_field)

				mt_complete_slot(td, field->hidinput->input);

				mt_complete_slot(td, input);



			if (field->index == td->last_field_index

				&& td->num_received >= td->num_expected)

drivers/hid/usbhid/hid-quirks.c

+2 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_FORMOSA, USB_DEVICE_ID_FORMOSA_IR_RECEIVER, HID_QUIRK_NO_INIT_REPORTS },

	{ USB_VENDOR_ID_FREESCALE, USB_DEVICE_ID_FREESCALE_MX28, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GX680R_LED_PANEL, HID_QUIRK_NO_INIT_REPORTS },

	{ USB_VENDOR_ID_NOVATEK, USB_DEVICE_ID_NOVATEK_MOUSE, HID_QUIRK_NO_INIT_REPORTS },

	{ USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN, HID_QUIRK_NO_INIT_REPORTS },

	{ USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN1, HID_QUIRK_NO_INIT_REPORTS },
@@ -80,6 +81,7 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_PRODIGE, USB_DEVICE_ID_PRODIGE_CORDLESS, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_REALTEK, USB_DEVICE_ID_REALTEK_READER, HID_QUIRK_NO_INIT_REPORTS },

	{ USB_VENDOR_ID_SENNHEISER, USB_DEVICE_ID_SENNHEISER_BTD500USB, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_SIGMATEL, USB_DEVICE_ID_SIGMATEL_STMP3780, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET },

CRA Git | Maintained and supported by SUSTech CRA and CCSE