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

Commit c241c5ee authored by Benjamin Tissoires's avatar Benjamin Tissoires Committed by Jiri Kosina
Browse files

HID: fix merge from wacom into the HID tree 



While merging wacom from the input to the hid tree, some
comments have been duplicated. We can also integrate the
test for Synaptics devices in the switch case below, so
it is clear that there will be only one place for such
quirks.

No functional changes are expected in this commit.

Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent afdb5cce

drivers/hid/hid-core.c

+7 −10
Original line number Diff line number Diff line
@@ -779,16 +779,6 @@ static int hid_scan_report(struct hid_device *hid) 
	    (hid->group == HID_GROUP_MULTITOUCH))

		hid->group = HID_GROUP_MULTITOUCH_WIN_8;



	/*

	* Vendor specific handlings

	*/

	if ((hid->vendor == USB_VENDOR_ID_SYNAPTICS) &&

	    (hid->group == HID_GROUP_GENERIC) &&

	    /* only bind to the mouse interface of composite USB devices */

	    (hid->bus != BUS_USB || hid->type == HID_TYPE_USBMOUSE))

		/* hid-rmi should take care of them, not hid-generic */

		hid->group = HID_GROUP_RMI;



	/*

	 * Vendor specific handlings

	 */
@@ -796,6 +786,13 @@ static int hid_scan_report(struct hid_device *hid) 
	case USB_VENDOR_ID_WACOM:

		hid->group = HID_GROUP_WACOM;

		break;

	case USB_VENDOR_ID_SYNAPTICS:

		if ((hid->group == HID_GROUP_GENERIC) &&

		    (hid->bus != BUS_USB || hid->type == HID_TYPE_USBMOUSE))

			/* hid-rmi should only bind to the mouse interface of

			 * composite USB devices */

			hid->group = HID_GROUP_RMI;

		break;

	}



	vfree(parser);

include/linux/hid.h

+0 −4
Original line number Diff line number Diff line
@@ -312,10 +312,6 @@ struct hid_item { 
 * Vendor specific HID device groups

 */

#define HID_GROUP_RMI				0x0100



/*

 * Vendor specific HID device groups

 */

#define HID_GROUP_WACOM				0x0101



/*