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

Commit d9cbf022 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:
  Revert "HID: magicmouse: ignore 'ivalid report id' while switching modes"
  HID: hid-multitouch: fix broken eGalax
  HID: MAINTAINERS: Update USB HID/HIDBP DRIVERS pattern
  HID: hid-multitouch: add support for Chunghwa multi-touch panel
  HID: hiddev: fix use after free in hiddev_release
  HID: add quirk for HyperPen 10000U
  HID: hiddev: fix potential use-after-free
parents 08356193 c3a49245

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -6463,7 +6463,7 @@ M: Jiri Kosina <jkosina@suse.cz> 
L:	linux-usb@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git

S:	Maintained

F:	Documentation/usb/hiddev.txt

F:	Documentation/hid/hiddev.txt

F:	drivers/hid/usbhid/



USB ISP116X DRIVER

drivers/hid/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -305,6 +305,7 @@ config HID_MULTITOUCH 
	  - 3M PCT touch screens

	  - ActionStar dual touch panels

	  - Cando dual touch panels

	  - Chunghwa panels

	  - CVTouch panels

	  - Cypress TrueTouch panels

	  - Elo TouchSystems IntelliTouch Plus panels

drivers/hid/hid-core.c

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

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHUNGHWAT, USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_PRODIKEYS_PCMIDI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CVTOUCH, USB_DEVICE_ID_CVTOUCH_SCREEN) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) },

drivers/hid/hid-ids.h

+4 −0
Original line number Diff line number Diff line
@@ -173,6 +173,9 @@ 
#define USB_DEVICE_ID_CHICONY_MULTI_TOUCH	0xb19d

#define USB_DEVICE_ID_CHICONY_WIRELESS	0x0618



#define USB_VENDOR_ID_CHUNGHWAT		0x2247

#define USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH	0x0001



#define USB_VENDOR_ID_CIDC		0x1677



#define USB_VENDOR_ID_CMEDIA		0x0d8c
@@ -622,6 +625,7 @@ 
#define USB_VENDOR_ID_UCLOGIC		0x5543

#define USB_DEVICE_ID_UCLOGIC_TABLET_PF1209	0x0042

#define USB_DEVICE_ID_UCLOGIC_TABLET_KNA5	0x6001

#define USB_DEVICE_ID_UCLOGIC_TABLET_TWA60	0x0064

#define USB_DEVICE_ID_UCLOGIC_TABLET_WP4030U	0x0003

#define USB_DEVICE_ID_UCLOGIC_TABLET_WP5540U	0x0004

#define USB_DEVICE_ID_UCLOGIC_TABLET_WP8060U	0x0005

drivers/hid/hid-magicmouse.c

+1 −9
Original line number Diff line number Diff line
@@ -501,17 +501,9 @@ static int magicmouse_probe(struct hid_device *hdev, 
	}

	report->size = 6;



	/*

	 * The device reponds with 'invalid report id' when feature

	 * report switching it into multitouch mode is sent to it.

	 *

	 * This results in -EIO from the _raw low-level transport callback,

	 * but there seems to be no other way of switching the mode.

	 * Thus the super-ugly hacky success check below.

	 */

	ret = hdev->hid_output_raw_report(hdev, feature, sizeof(feature),

			HID_FEATURE_REPORT);

	if (ret != -EIO) {

	if (ret != sizeof(feature)) {

		hid_err(hdev, "unable to request touch data (%d)\n", ret);

		goto err_stop_hw;

	}