Commit 9b14b066 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

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

- "heartbeat" report fix for several Wacom devices
- Lenovo X1 Tablet support improvements
- new device IDs
- bounds checking fix in hid-roccat
- stylus battery reporting fix
parents 146f9d91 505f394f

drivers/hid/hid-core.c

+4 −4
Original line number Diff line number Diff line
@@ -927,7 +927,7 @@ static int hid_scan_report(struct hid_device *hid) 
/**

 * hid_parse_report - parse device report

 *

 * @device: hid device

 * @hid: hid device

 * @start: report start

 * @size: report size

 *
@@ -952,7 +952,7 @@ static const char * const hid_report_names[] = { 
/**

 * hid_validate_values - validate existing device report's value indexes

 *

 * @device: hid device

 * @hid: hid device

 * @type: which report type to examine

 * @id: which report ID to examine (0 for first)

 * @field_index: which report field to examine
@@ -1451,7 +1451,7 @@ static int search(__s32 *array, __s32 value, unsigned n) 
 * hid_match_report - check if driver's raw_event should be called

 *

 * @hid: hid device

 * @report_type: type to match against

 * @report: hid report to match against

 *

 * compare hid->driver->report_table->report_type to report->type

 */
@@ -2127,7 +2127,7 @@ struct hid_dynid { 


/**

 * store_new_id - add a new HID device ID to this driver and re-probe devices

 * @driver: target device driver

 * @drv: target device driver

 * @buf: buffer for scanning device ID data

 * @count: input size

 *

drivers/hid/hid-ids.h

+3 −0
Original line number Diff line number Diff line
@@ -727,6 +727,8 @@ 
#define USB_DEVICE_ID_LENOVO_TP10UBKBD	0x6062

#define USB_DEVICE_ID_LENOVO_TPPRODOCK	0x6067

#define USB_DEVICE_ID_LENOVO_X1_COVER	0x6085

#define USB_DEVICE_ID_LENOVO_X1_TAB	0x60a3

#define USB_DEVICE_ID_LENOVO_X1_TAB3	0x60b5

#define USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_608D	0x608d

#define USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_6019	0x6019

#define USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_602E	0x602e
@@ -1123,6 +1125,7 @@ 
#define USB_DEVICE_ID_SYNAPTICS_DELL_K12A	0x2819

#define USB_DEVICE_ID_SYNAPTICS_ACER_SWITCH5_012	0x2968

#define USB_DEVICE_ID_SYNAPTICS_TP_V103	0x5710

#define USB_DEVICE_ID_SYNAPTICS_ACER_ONE_S1003	0x73f5

#define USB_DEVICE_ID_SYNAPTICS_ACER_SWITCH5	0x81a7



#define USB_VENDOR_ID_TEXAS_INSTRUMENTS	0x2047

drivers/hid/hid-input.c

+2 −2
Original line number Diff line number Diff line
@@ -797,7 +797,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel 
		case 0x3b: /* Battery Strength */

			hidinput_setup_battery(device, HID_INPUT_REPORT, field);

			usage->type = EV_PWR;

			goto ignore;

			return;



		case 0x3c: /* Invert */

			map_key_clear(BTN_TOOL_RUBBER);
@@ -1059,7 +1059,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel 
		case HID_DC_BATTERYSTRENGTH:

			hidinput_setup_battery(device, HID_INPUT_REPORT, field);

			usage->type = EV_PWR;

			goto ignore;

			return;

		}

		goto unknown;

drivers/hid/hid-ite.c

+4 −0
Original line number Diff line number Diff line
@@ -44,6 +44,10 @@ static const struct hid_device_id ite_devices[] = { 
	{ HID_DEVICE(BUS_USB, HID_GROUP_GENERIC,

		     USB_VENDOR_ID_SYNAPTICS,

		     USB_DEVICE_ID_SYNAPTICS_ACER_SWITCH5_012) },

	/* ITE8910 USB kbd ctlr, with Synaptics touchpad connected to it. */

	{ HID_DEVICE(BUS_USB, HID_GROUP_GENERIC,

		     USB_VENDOR_ID_SYNAPTICS,

		     USB_DEVICE_ID_SYNAPTICS_ACER_ONE_S1003) },

	{ }

};

MODULE_DEVICE_TABLE(hid, ite_devices);

drivers/hid/hid-multitouch.c

+12 −0
Original line number Diff line number Diff line
@@ -1973,6 +1973,18 @@ static const struct hid_device_id mt_devices[] = { 
		HID_DEVICE(BUS_I2C, HID_GROUP_GENERIC,

			USB_VENDOR_ID_LG, I2C_DEVICE_ID_LG_7010) },



	/* Lenovo X1 TAB Gen 2 */

	{ .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT,

		HID_DEVICE(BUS_USB, HID_GROUP_MULTITOUCH_WIN_8,

			   USB_VENDOR_ID_LENOVO,

			   USB_DEVICE_ID_LENOVO_X1_TAB) },



	/* Lenovo X1 TAB Gen 3 */

	{ .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT,

		HID_DEVICE(BUS_USB, HID_GROUP_MULTITOUCH_WIN_8,

			   USB_VENDOR_ID_LENOVO,

			   USB_DEVICE_ID_LENOVO_X1_TAB3) },



	/* MosArt panels */

	{ .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE,

		MT_USB_DEVICE(USB_VENDOR_ID_ASUS,