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

Commit 375ac3e0 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: hid-multitouch: add support for a new Lumio dual-touch panel
  HID: hid-multitouch: correct VID for Stantum panels
  HID: hid-multitouch: ensure slots are initialized
parents edcda265 c3ead6de

drivers/hid/hid-core.c

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

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_SPACETRAVELLER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_SPACENAVIGATOR) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_SPACENAVIGATOR) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LUMIO, USB_DEVICE_ID_CRYSTALTOUCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LUMIO, USB_DEVICE_ID_CRYSTALTOUCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LUMIO, USB_DEVICE_ID_CRYSTALTOUCH_DUAL) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICOLCD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICOLCD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICOLCD_BOOTLOADER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICOLCD_BOOTLOADER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV) },

drivers/hid/hid-ids.h

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




#define USB_VENDOR_ID_LUMIO		0x202e

#define USB_VENDOR_ID_LUMIO		0x202e

#define USB_DEVICE_ID_CRYSTALTOUCH	0x0006

#define USB_DEVICE_ID_CRYSTALTOUCH	0x0006

#define USB_DEVICE_ID_CRYSTALTOUCH_DUAL	0x0007





#define USB_VENDOR_ID_MCC		0x09db

#define USB_VENDOR_ID_MCC		0x09db

#define USB_DEVICE_ID_MCC_PMD1024LS	0x0076

#define USB_DEVICE_ID_MCC_PMD1024LS	0x0076

drivers/hid/hid-multitouch.c

+7 −5
Original line number Original line Diff line number Diff line
@@ -271,6 +271,8 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi, 
			}

			}

			return 1;

			return 1;

		case HID_DG_CONTACTID:

		case HID_DG_CONTACTID:

			if (!td->maxcontacts)

				td->maxcontacts = MT_DEFAULT_MAXCONTACT;

			input_mt_init_slots(hi->input, td->maxcontacts);

			input_mt_init_slots(hi->input, td->maxcontacts);

			td->last_slot_field = usage->hid;

			td->last_slot_field = usage->hid;

			td->last_field_index = field->index;

			td->last_field_index = field->index;
@@ -547,9 +549,6 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id) 
	if (ret)

	if (ret)

		goto fail;

		goto fail;





	if (!td->maxcontacts)

		td->maxcontacts = MT_DEFAULT_MAXCONTACT;



	td->slots = kzalloc(td->maxcontacts * sizeof(struct mt_slot),

	td->slots = kzalloc(td->maxcontacts * sizeof(struct mt_slot),

				GFP_KERNEL);

				GFP_KERNEL);

	if (!td->slots) {

	if (!td->slots) {
@@ -677,6 +676,9 @@ static const struct hid_device_id mt_devices[] = { 
	{ .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE,

	{ .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE,

		HID_USB_DEVICE(USB_VENDOR_ID_LUMIO,

		HID_USB_DEVICE(USB_VENDOR_ID_LUMIO,

			USB_DEVICE_ID_CRYSTALTOUCH) },

			USB_DEVICE_ID_CRYSTALTOUCH) },

	{ .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE,

		HID_USB_DEVICE(USB_VENDOR_ID_LUMIO,

			USB_DEVICE_ID_CRYSTALTOUCH_DUAL) },





	/* MosArt panels */

	/* MosArt panels */

	{ .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE,

	{ .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE,
@@ -707,10 +709,10 @@ static const struct hid_device_id mt_devices[] = { 
		HID_USB_DEVICE(USB_VENDOR_ID_STANTUM,

		HID_USB_DEVICE(USB_VENDOR_ID_STANTUM,

			USB_DEVICE_ID_MTP)},

			USB_DEVICE_ID_MTP)},

	{ .driver_data = MT_CLS_CONFIDENCE,

	{ .driver_data = MT_CLS_CONFIDENCE,

		HID_USB_DEVICE(USB_VENDOR_ID_STANTUM,

		HID_USB_DEVICE(USB_VENDOR_ID_STANTUM_STM,

			USB_DEVICE_ID_MTP_STM)},

			USB_DEVICE_ID_MTP_STM)},

	{ .driver_data = MT_CLS_CONFIDENCE,

	{ .driver_data = MT_CLS_CONFIDENCE,

		HID_USB_DEVICE(USB_VENDOR_ID_STANTUM,

		HID_USB_DEVICE(USB_VENDOR_ID_STANTUM_SITRONIX,

			USB_DEVICE_ID_MTP_SITRONIX)},

			USB_DEVICE_ID_MTP_SITRONIX)},





	/* Touch International panels */

	/* Touch International panels */