Commit 1248ded6 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:
 "Fixes for the HID subsystem:

   - regression fix for Wacom driver; commit introduced in 4.6-rc1
     mistakenly removed line that should be kept.  Fix by Ping Cheng

   - two device-specific quirks, by Ping Cheng and Nazar Mokrynskyi"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: wacom: add missed stylus_in_proximity line back
  HID: Fix boot delay for Creative SB Omni Surround 5.1 with quirk
  HID: wacom: Add support for DTK-1651
parents 1f6211a4 eff6ca97

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -259,6 +259,7 @@ 
#define USB_DEVICE_ID_CORSAIR_K90	0x1b02



#define USB_VENDOR_ID_CREATIVELABS	0x041e

#define USB_DEVICE_ID_CREATIVE_SB_OMNI_SURROUND_51	0x322c

#define USB_DEVICE_ID_PRODIKEYS_PCMIDI	0x2801



#define USB_VENDOR_ID_CVTOUCH		0x1ff7

drivers/hid/usbhid/hid-quirks.c

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_3AXIS_5BUTTON_STICK, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_AXIS_295, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE, HID_QUIRK_ALWAYS_POLL },

	{ USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_CREATIVE_SB_OMNI_SURROUND_51, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_WIIU, HID_QUIRK_MULTI_INPUT },

	{ USB_VENDOR_ID_ELAN, HID_ANY_ID, HID_QUIRK_ALWAYS_POLL },

drivers/hid/wacom_wac.c

+6 −0
Original line number Diff line number Diff line
@@ -684,6 +684,7 @@ static int wacom_intuos_inout(struct wacom_wac *wacom) 


		wacom->tool[idx] = wacom_intuos_get_tool_type(wacom->id[idx]);



		wacom->shared->stylus_in_proximity = true;

		return 1;

	}
@@ -3395,6 +3396,10 @@ static const struct wacom_features wacom_features_0x33E = 
	{ "Wacom Intuos PT M 2", 21600, 13500, 2047, 63,

	  INTUOSHT2, WACOM_INTUOS_RES, WACOM_INTUOS_RES, .touch_max = 16,

	  .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };

static const struct wacom_features wacom_features_0x343 =

	{ "Wacom DTK1651", 34616, 19559, 1023, 0,

	  DTUS, WACOM_INTUOS_RES, WACOM_INTUOS_RES, 4,

	  WACOM_DTU_OFFSET, WACOM_DTU_OFFSET };



static const struct wacom_features wacom_features_HID_ANY_ID =

	{ "Wacom HID", .type = HID_GENERIC };
@@ -3560,6 +3565,7 @@ const struct hid_device_id wacom_ids[] = { 
	{ USB_DEVICE_WACOM(0x33C) },

	{ USB_DEVICE_WACOM(0x33D) },

	{ USB_DEVICE_WACOM(0x33E) },

	{ USB_DEVICE_WACOM(0x343) },

	{ USB_DEVICE_WACOM(0x4001) },

	{ USB_DEVICE_WACOM(0x4004) },

	{ USB_DEVICE_WACOM(0x5000) },

CRA Git | Maintained and supported by SUSTech CRA and CCSE