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

Commit d7a4b63b 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 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: fix hiddev's use of usb_find_interface
  HID: fixup blacklist entry for Asus T91MT
  HID: add device ID for new Asus Multitouch Controller
  HID: add no-get quirk for eGalax touch controller
  HID: Add quirk for eGalax touch controler.
  HID: add support for another BTC Emprex remote control
  HID: Set Report ID properly for Output reports on the Control endpoint.
  HID: Kanvus Note A5 tablet needs HID_QUIRK_MULTI_INPUT
  HID: Add support for chicony multitouch screens.
parents de8d4f5d 8fe294ca

drivers/hid/hid-core.c

+3 −1
Original line number Diff line number Diff line
@@ -1285,8 +1285,11 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_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_ASUS, USB_DEVICE_ID_ASUS_T91MT) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUSTEK_MULTITOUCH_YFO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) },
@@ -1578,7 +1581,6 @@ static const struct hid_device_id hid_ignore_list[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_24) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_AIRCABLE, USB_DEVICE_ID_AIRCABLE1) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ALCOR, USB_DEVICE_ID_ALCOR_USBRS232) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_T91MT)},

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_LCM)},

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_LCM2)},

	{ HID_USB_DEVICE(USB_VENDOR_ID_AVERMEDIA, USB_DEVICE_ID_AVER_FM_MR800) },

drivers/hid/hid-ids.h

+4 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ 


#define USB_VENDOR_ID_ASUS		0x0486

#define USB_DEVICE_ID_ASUS_T91MT	0x0185

#define USB_DEVICE_ID_ASUSTEK_MULTITOUCH_YFO	0x0186



#define USB_VENDOR_ID_ASUSTEK		0x0b05

#define USB_DEVICE_ID_ASUSTEK_LCM	0x1726
@@ -128,6 +129,7 @@ 


#define USB_VENDOR_ID_BTC		0x046e

#define USB_DEVICE_ID_BTC_EMPREX_REMOTE	0x5578

#define USB_DEVICE_ID_BTC_EMPREX_REMOTE_2	0x5577



#define USB_VENDOR_ID_CANDO		0x2087

#define USB_DEVICE_ID_CANDO_MULTI_TOUCH	0x0a01
@@ -149,6 +151,7 @@ 


#define USB_VENDOR_ID_CHICONY		0x04f2

#define USB_DEVICE_ID_CHICONY_TACTICAL_PAD	0x0418

#define USB_DEVICE_ID_CHICONY_MULTI_TOUCH	0xb19d



#define USB_VENDOR_ID_CIDC		0x1677
@@ -507,6 +510,7 @@ 
#define USB_VENDOR_ID_UCLOGIC		0x5543

#define USB_DEVICE_ID_UCLOGIC_TABLET_PF1209	0x0042

#define USB_DEVICE_ID_UCLOGIC_TABLET_WP4030U	0x0003

#define USB_DEVICE_ID_UCLOGIC_TABLET_KNA5	0x6001



#define USB_VENDOR_ID_VERNIER		0x08f7

#define USB_DEVICE_ID_VERNIER_LABPRO	0x0001

drivers/hid/hid-mosart.c

+1 −0
Original line number Diff line number Diff line
@@ -239,6 +239,7 @@ static void mosart_remove(struct hid_device *hdev) 


static const struct hid_device_id mosart_devices[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_T91MT) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUSTEK_MULTITOUCH_YFO) },

	{ }

};

MODULE_DEVICE_TABLE(hid, mosart_devices);

drivers/hid/hid-topseed.c

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ static int ts_input_mapping(struct hid_device *hdev, struct hid_input *hi, 
static const struct hid_device_id ts_devices[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED, USB_DEVICE_ID_TOPSEED_CYBERLINK) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED2, USB_DEVICE_ID_TOPSEED2_RF_COMBO) },

	{ }

};

drivers/hid/usbhid/hid-core.c

+7 −1
Original line number Diff line number Diff line
@@ -828,6 +828,7 @@ static int usbhid_output_raw_report(struct hid_device *hid, __u8 *buf, size_t co 
		}

	} else {

		int skipped_report_id = 0;

		int report_id = buf[0];

		if (buf[0] == 0x0) {

			/* Don't send the Report ID */

			buf++;
@@ -837,7 +838,7 @@ static int usbhid_output_raw_report(struct hid_device *hid, __u8 *buf, size_t co 
		ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),

			HID_REQ_SET_REPORT,

			USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,

			((report_type + 1) << 8) | *buf,

			((report_type + 1) << 8) | report_id,

			interface->desc.bInterfaceNumber, buf, count,

			USB_CTRL_SET_TIMEOUT);

		/* count also the report id, if this was a numbered report. */
@@ -1445,6 +1446,11 @@ static const struct hid_device_id hid_usb_table[] = { 
	{ }

};



struct usb_interface *usbhid_find_interface(int minor)

{

	return usb_find_interface(&hid_driver, minor);

}



static struct hid_driver hid_usb_driver = {

	.name = "generic-usb",

	.id_table = hid_usb_table,