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

Commit eee551df 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:

 - Wacom regression fixes, from Aaron Armstrong Skomra

 - new device ID addition by Peter Stein

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: wacom: call _query_tablet_data() for BAMBOO_TOUCH
  HID: wacom: Don't add ghost interface as shared data
  HID: xinmo: fix for out of range for THT 2P arcade controller.
parents 5559394d 4d20c332

drivers/hid/hid-core.c

+1 −0
Original line number Diff line number Diff line
@@ -2112,6 +2112,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_SIRIUS_BATTERY_FREE_TABLET) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_X_TENSIONS, USB_DEVICE_ID_SPEEDLINK_VAD_CEZANNE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_XIN_MO_DUAL_ARCADE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_THT_2P_ARCADE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ZYDACRON, USB_DEVICE_ID_ZYDACRON_REMOTE_CONTROL) },

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -1082,6 +1082,7 @@ 


#define USB_VENDOR_ID_XIN_MO			0x16c0

#define USB_DEVICE_ID_XIN_MO_DUAL_ARCADE	0x05e1

#define USB_DEVICE_ID_THT_2P_ARCADE		0x75e1



#define USB_VENDOR_ID_XIROKU		0x1477

#define USB_DEVICE_ID_XIROKU_SPX	0x1006

drivers/hid/hid-xinmo.c

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ static int xinmo_event(struct hid_device *hdev, struct hid_field *field, 


static const struct hid_device_id xinmo_devices[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_XIN_MO_DUAL_ARCADE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_THT_2P_ARCADE) },

	{ }

};

drivers/hid/wacom_sys.c

+10 −8
Original line number Diff line number Diff line
@@ -2165,6 +2165,14 @@ static int wacom_parse_and_register(struct wacom *wacom, bool wireless) 


	wacom_update_name(wacom, wireless ? " (WL)" : "");



	/* pen only Bamboo neither support touch nor pad */

	if ((features->type == BAMBOO_PEN) &&

	    ((features->device_type & WACOM_DEVICETYPE_TOUCH) ||

	    (features->device_type & WACOM_DEVICETYPE_PAD))) {

		error = -ENODEV;

		goto fail;

	}



	error = wacom_add_shared_data(hdev);

	if (error)

		goto fail;
@@ -2208,14 +2216,8 @@ static int wacom_parse_and_register(struct wacom *wacom, bool wireless) 
	/* touch only Bamboo doesn't support pen */

	if ((features->type == BAMBOO_TOUCH) &&

	    (features->device_type & WACOM_DEVICETYPE_PEN)) {

		error = -ENODEV;

		goto fail_quirks;

	}



	/* pen only Bamboo neither support touch nor pad */

	if ((features->type == BAMBOO_PEN) &&

	    ((features->device_type & WACOM_DEVICETYPE_TOUCH) ||

	    (features->device_type & WACOM_DEVICETYPE_PAD))) {

		cancel_delayed_work_sync(&wacom->init_work);

		_wacom_query_tablet_data(wacom);

		error = -ENODEV;

		goto fail_quirks;

	}