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

Commit ed42350e authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'upstream-fixes' into for-next 

Conflicts:

	drivers/hid/hid-ids.h
parents 1db489b2 4dfdc464

drivers/hid/hid-core.c

+1 −0
Original line number Diff line number Diff line
@@ -1498,6 +1498,7 @@ static const struct hid_device_id hid_ignore_list[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_CMEDIA, USB_DEVICE_ID_CM109) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_HIDCOM) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_ULTRAMOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DEALEXTREAME, USB_DEVICE_ID_DEALEXTREAME_RADIO_SI4701) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5) },

drivers/hid/hid-ids.h

+6 −0
Original line number Diff line number Diff line
@@ -138,6 +138,9 @@ 
#define USB_DEVICE_ID_CYPRESS_BARCODE_1	0xde61

#define USB_DEVICE_ID_CYPRESS_BARCODE_2	0xde64



#define USB_VENDOR_ID_DEALEXTREAME	0x10c5

#define USB_DEVICE_ID_DEALEXTREAME_RADIO_SI4701	0x819a



#define USB_VENDOR_ID_DELORME		0x1163

#define USB_DEVICE_ID_DELORME_EARTHMATE 0x0100

#define USB_DEVICE_ID_DELORME_EM_LT20	0x0200
@@ -381,6 +384,9 @@ 
#define USB_VENDOR_ID_TURBOX		0x062a

#define USB_DEVICE_ID_TURBOX_KEYBOARD	0x0201



#define USB_VENDOR_ID_UCLOGIC		0x5543

#define USB_DEVICE_ID_UCLOGIC_TABLET_PF1209	0x0042



#define USB_VENDOR_ID_VERNIER		0x08f7

#define USB_DEVICE_ID_VERNIER_LABPRO	0x0001

#define USB_DEVICE_ID_VERNIER_GOTEMP	0x0002

drivers/hid/hid-sony.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id) 
	}



	ret = sony_set_operational(hdev);

	if (ret)

	if (ret < 0)

		goto err_stop;



	return 0;

drivers/hid/hidraw.c

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ static int hidraw_release(struct inode * inode, struct file * file) 


	list_del(&list->node);

	dev = hidraw_table[minor];

	if (!dev->open--) {

	if (!--dev->open) {

		if (list->hidraw->exist)

			dev->hid->ll_driver->close(dev->hid);

		else

drivers/hid/usbhid/hid-quirks.c

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_KEYBOARD, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_PF1209, HID_QUIRK_MULTI_INPUT },

	{ USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT | HID_QUIRK_SKIP_OUTPUT_REPORTS },

	{ USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },