Commit 83fd5ddc authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-4.14/upstream-fixes' into for-linus 



- Wacom: recognize PEN application collection properly, from Jason Gerecke
- RMI: avoid cofusion caused by RMI functions being by mistake called on
  non-RMI devices, from Andrew Duggan
- small device-ID-specific quirks/fixes

Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parents a0933a45 1477edb4

drivers/hid/hid-core.c

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

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb323) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb324) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb605) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb651) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb653) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654) },

drivers/hid/hid-ids.h

+3 −0
Original line number Diff line number Diff line
@@ -729,6 +729,9 @@ 
#define USB_DEVICE_ID_MCC_PMD1024LS	0x0076

#define USB_DEVICE_ID_MCC_PMD1208LS	0x007a



#define USB_VENDOR_ID_MCS		0x16d0

#define USB_DEVICE_ID_MCS_GAMEPADBLOCK	0x0bcc



#define USB_VENDOR_ID_MGE		0x0463

#define USB_DEVICE_ID_MGE_UPS		0xffff

#define USB_DEVICE_ID_MGE_UPS1		0x0001

drivers/hid/hid-rmi.c

+10 −3
Original line number Diff line number Diff line
@@ -368,6 +368,11 @@ static int rmi_check_sanity(struct hid_device *hdev, u8 *data, int size) 
static int rmi_raw_event(struct hid_device *hdev,

		struct hid_report *report, u8 *data, int size)

{

	struct rmi_data *hdata = hid_get_drvdata(hdev);



	if (!(hdata->device_flags & RMI_DEVICE))

		return 0;



	size = rmi_check_sanity(hdev, data, size);

	if (size < 2)

		return 0;
@@ -713,9 +718,11 @@ static void rmi_remove(struct hid_device *hdev) 
{

	struct rmi_data *hdata = hid_get_drvdata(hdev);



	if (hdata->device_flags & RMI_DEVICE) {

		clear_bit(RMI_STARTED, &hdata->flags);

		cancel_work_sync(&hdata->reset_work);

		rmi_unregister_transport_device(&hdata->xport);

	}



	hid_hw_stop(hdev);

}

drivers/hid/hid-tmff.c

+2 −0
Original line number Diff line number Diff line
@@ -242,6 +242,8 @@ static const struct hid_device_id tm_devices[] = { 
		.driver_data = (unsigned long)ff_rumble },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb324),   /* Dual Trigger 3-in-1 (PS3 Mode) */

		.driver_data = (unsigned long)ff_rumble },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb605),   /* NASCAR PRO FF2 Wheel */

		.driver_data = (unsigned long)ff_joystick },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb651),	/* FGT Rumble Force Wheel */

		.driver_data = (unsigned long)ff_rumble },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb653),	/* RGT Force Feedback CLUTCH Raging Wheel */

drivers/hid/usbhid/hid-quirks.c

+1 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_DRACAL_RAPHNET, USB_DEVICE_ID_RAPHNET_2NES2SNES, HID_QUIRK_MULTI_INPUT },

	{ USB_VENDOR_ID_DRACAL_RAPHNET, USB_DEVICE_ID_RAPHNET_4NES4SNES, HID_QUIRK_MULTI_INPUT },

	{ USB_VENDOR_ID_INNOMEDIA, USB_DEVICE_ID_INNEX_GENESIS_ATARI, HID_QUIRK_MULTI_INPUT },

	{ USB_VENDOR_ID_MCS, USB_DEVICE_ID_MCS_GAMEPADBLOCK, HID_QUIRK_MULTI_INPUT },



	{ 0, 0 }

};