Commit b81fd5ba 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 

Pull HID fixes from Jiri Kosina:
 - fix for merge window mismerge in hid-sony, from Frank Praznik
 - fix for Surface Type/Touch Cover 2 device, from Benjamin Tissoires
 - quirk for ThinkPad Helix sensor hub from Stephen Chandler Paul

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: core: do not scan constant input report
  Revert "HID: microsoft: Add ID's for Surface Type/Touch Cover 2"
  HID: sensor-hub: add sensor hub quirk for ThinkPad Helix
  HID: sony: Fix cancel_work_sync mismerge
parents 2f3e12bd e24d0d39

drivers/hid/hid-core.c

+3 −2
Original line number Diff line number Diff line
@@ -718,6 +718,9 @@ static int hid_scan_main(struct hid_parser *parser, struct hid_item *item) 
	case HID_MAIN_ITEM_TAG_END_COLLECTION:

		break;

	case HID_MAIN_ITEM_TAG_INPUT:

		/* ignore constant inputs, they will be ignored by hid-input */

		if (data & HID_MAIN_ITEM_CONSTANT)

			break;

		for (i = 0; i < parser->local.usage_index; i++)

			hid_scan_input_usage(parser, parser->local.usage[i]);

		break;
@@ -1821,8 +1824,6 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_OFFICE_KB) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) },

drivers/hid/hid-ids.h

+2 −3
Original line number Diff line number Diff line
@@ -455,7 +455,8 @@ 


#define USB_VENDOR_ID_INTEL_0		0x8086

#define USB_VENDOR_ID_INTEL_1		0x8087

#define USB_DEVICE_ID_INTEL_HID_SENSOR	0x09fa

#define USB_DEVICE_ID_INTEL_HID_SENSOR_0	0x09fa

#define USB_DEVICE_ID_INTEL_HID_SENSOR_1	0x0a04



#define USB_VENDOR_ID_STM_0             0x0483

#define USB_DEVICE_ID_STM_HID_SENSOR    0x91d1
@@ -629,8 +630,6 @@ 
#define USB_DEVICE_ID_MS_PRESENTER_8K_USB	0x0713

#define USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K	0x0730

#define USB_DEVICE_ID_MS_COMFORT_MOUSE_4500	0x076c

#define USB_DEVICE_ID_MS_TOUCH_COVER_2	0x07a7

#define USB_DEVICE_ID_MS_TYPE_COVER_2	0x07a9



#define USB_VENDOR_ID_MOJO		0x8282

#define USB_DEVICE_ID_RETRO_ADAPTER	0x3201

drivers/hid/hid-microsoft.c

+0 −4
Original line number Diff line number Diff line
@@ -274,10 +274,6 @@ static const struct hid_device_id ms_devices[] = { 
		.driver_data = MS_NOGET },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_MOUSE_4500),

		.driver_data = MS_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_2),

		.driver_data = 0 },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2),

		.driver_data = 0 },



	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT),

		.driver_data = MS_PRESENTER },

drivers/hid/hid-sensor-hub.c

+5 −2
Original line number Diff line number Diff line
@@ -697,10 +697,13 @@ static void sensor_hub_remove(struct hid_device *hdev) 


static const struct hid_device_id sensor_hub_devices[] = {

	{ HID_DEVICE(HID_BUS_ANY, HID_GROUP_SENSOR_HUB, USB_VENDOR_ID_INTEL_0,

			USB_DEVICE_ID_INTEL_HID_SENSOR),

			USB_DEVICE_ID_INTEL_HID_SENSOR_0),

			.driver_data = HID_SENSOR_HUB_ENUM_QUIRK},

	{ HID_DEVICE(HID_BUS_ANY, HID_GROUP_SENSOR_HUB, USB_VENDOR_ID_INTEL_1,

			USB_DEVICE_ID_INTEL_HID_SENSOR),

			USB_DEVICE_ID_INTEL_HID_SENSOR_0),

			.driver_data = HID_SENSOR_HUB_ENUM_QUIRK},

	{ HID_DEVICE(HID_BUS_ANY, HID_GROUP_SENSOR_HUB, USB_VENDOR_ID_INTEL_1,

			USB_DEVICE_ID_INTEL_HID_SENSOR_1),

			.driver_data = HID_SENSOR_HUB_ENUM_QUIRK},

	{ HID_DEVICE(HID_BUS_ANY, HID_GROUP_SENSOR_HUB, USB_VENDOR_ID_STM_0,

			USB_DEVICE_ID_STM_HID_SENSOR),

drivers/hid/hid-sony.c

+0 −2
Original line number Diff line number Diff line
@@ -1721,8 +1721,6 @@ static void sony_remove(struct hid_device *hdev) 
	if (sc->quirks & SONY_LED_SUPPORT)

		sony_leds_remove(hdev);



	if (sc->worker_initialized)

		cancel_work_sync(&sc->state_worker);

	if (sc->quirks & SONY_BATTERY_SUPPORT) {

		hid_hw_close(hdev);

		sony_battery_remove(sc);

CRA Git | Maintained and supported by SUSTech CRA and CCSE