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

Commit 293ffa8f 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: Send Report ID when numbered reports are sent over the control endpoint.
  HID: Enable HID_QUIRK_MULTI_INPUT for Retro Adaptor
  HID: add support for CH Eclipse yoke
  HID: eliminate a double lock in debug code
  HID: ntrig: add support for new firwmare versions
  HID: check for HID_QUIRK_IGNORE during probing
  HID: roccat: fix modules interdependencies
parents 70aff0ce 29129a98

drivers/hid/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -358,6 +358,7 @@ config HID_ROCCAT 
config HID_ROCCAT_KONE

	tristate "Roccat Kone Mouse support"

	depends on USB_HID

	select HID_ROCCAT

	---help---

	Support for Roccat Kone mouse.

drivers/hid/hid-core.c

+20 −1
Original line number Diff line number Diff line
@@ -1337,6 +1337,24 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },

	{ 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) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_3) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_4) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_5) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_6) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_7) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_8) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_9) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_10) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_11) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_12) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_13) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_14) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_15) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_16) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_17) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) },
@@ -1760,7 +1778,8 @@ int hid_add_device(struct hid_device *hdev) 


	/* we need to kill them here, otherwise they will stay allocated to

	 * wait for coming driver */

	if (!(hdev->quirks & HID_QUIRK_NO_IGNORE) && hid_ignore(hdev))

	if (!(hdev->quirks & HID_QUIRK_NO_IGNORE)

            && (hid_ignore(hdev) || (hdev->quirks & HID_QUIRK_IGNORE)))

		return -ENODEV;



	/* XXX hack, any other cleaner solution after the driver core

drivers/hid/hid-debug.c

+1 −1
Original line number Diff line number Diff line
@@ -949,8 +949,8 @@ static ssize_t hid_debug_events_read(struct file *file, char __user *buffer, 
	int ret = 0, len;

	DECLARE_WAITQUEUE(wait, current);



	while (ret == 0) {

	mutex_lock(&list->read_mutex);

	while (ret == 0) {

		if (list->head == list->tail) {

			add_wait_queue(&list->hdev->debug_wait, &wait);

			set_current_state(TASK_INTERRUPTIBLE);

drivers/hid/hid-ids.h

+21 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ 
#define USB_VENDOR_ID_CH		0x068e

#define USB_DEVICE_ID_CH_PRO_PEDALS	0x00f2

#define USB_DEVICE_ID_CH_COMBATSTICK	0x00f4

#define USB_DEVICE_ID_CH_FLIGHT_SIM_ECLIPSE_YOKE       0x0051

#define USB_DEVICE_ID_CH_FLIGHT_SIM_YOKE	0x00ff

#define USB_DEVICE_ID_CH_3AXIS_5BUTTON_STICK	0x00d3
@@ -369,6 +370,8 @@ 
#define USB_DEVICE_ID_MS_PRESENTER_8K_BT	0x0701

#define USB_DEVICE_ID_MS_PRESENTER_8K_USB	0x0713



#define USB_VENDOR_ID_MOJO		0x8282

#define USB_DEVICE_ID_RETRO_ADAPTER	0x3201



#define USB_VENDOR_ID_MONTEREY		0x0566

#define USB_DEVICE_ID_GENIUS_KB29E	0x3004
@@ -391,6 +394,24 @@ 


#define USB_VENDOR_ID_NTRIG                0x1b96

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN   0x0001

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1   0x0003

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_2   0x0004

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_3   0x0005

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_4   0x0006

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_5   0x0007

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_6   0x0008

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_7   0x0009

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_8   0x000A

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_9   0x000B

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_10   0x000C

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_11   0x000D

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_12   0x000E

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_13   0x000F

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_14   0x0010

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_15   0x0011

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_16   0x0012

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_17   0x0013

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18   0x0014



#define USB_VENDOR_ID_ONTRAK		0x0a07

#define USB_DEVICE_ID_ONTRAK_ADU100	0x0064

drivers/hid/hid-ntrig.c

+36 −0
Original line number Diff line number Diff line
@@ -868,6 +868,42 @@ static void ntrig_remove(struct hid_device *hdev) 
static const struct hid_device_id ntrig_devices[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_2),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_3),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_4),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_5),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_6),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_7),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_8),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_9),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_10),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_11),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_12),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_13),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_14),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_15),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_16),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_17),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ }

};

MODULE_DEVICE_TABLE(hid, ntrig_devices);