Commit a94f66ae authored by Hans de Goede's avatar Hans de Goede Committed by Jiri Kosina
Browse files

HID: asus: Cleanup Asus T101HA keyboard-dock handling 



There is no need to use a quirk and then return -ENODEV from the
asus_probe() function to avoid that hid-asus binds to the hiddev
for the USB-interface for the hid-multitouch touchpad.

The hid-multitouch hiddev has a group of HID_GROUP_MULTITOUCH_WIN_8,
so the same result can be achieved by making the hid_device_id entry
for the dock in the asus_devices[] table only match on HID_GROUP_GENERIC
instead of having it match HID_GROUP_ANY.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 4b4f6cec

drivers/hid/hid-asus.c

+9 −11
Original line number Diff line number Diff line
@@ -79,10 +79,9 @@ MODULE_DESCRIPTION("Asus HID Keyboard and TouchPad"); 
#define QUIRK_T100_KEYBOARD		BIT(6)

#define QUIRK_T100CHI			BIT(7)

#define QUIRK_G752_KEYBOARD		BIT(8)

#define QUIRK_T101HA_DOCK		BIT(9)

#define QUIRK_T90CHI			BIT(10)

#define QUIRK_MEDION_E1239T		BIT(11)

#define QUIRK_ROG_NKEY_KEYBOARD		BIT(12)

#define QUIRK_T90CHI			BIT(9)

#define QUIRK_MEDION_E1239T		BIT(10)

#define QUIRK_ROG_NKEY_KEYBOARD		BIT(11)



#define I2C_KEYBOARD_QUIRKS			(QUIRK_FIX_NOTEBOOK_REPORT | \

						 QUIRK_NO_INIT_REPORTS | \
@@ -1082,11 +1081,6 @@ static int asus_probe(struct hid_device *hdev, const struct hid_device_id *id) 
		return ret;

	}



	/* use hid-multitouch for T101HA touchpad */

	if (id->driver_data & QUIRK_T101HA_DOCK &&

	    hdev->collection->usage == HID_GD_MOUSE)

		return -ENODEV;



	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);

	if (ret) {

		hid_err(hdev, "Asus hw start failed: %d\n", ret);
@@ -1240,8 +1234,6 @@ static const struct hid_device_id asus_devices[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,

		USB_DEVICE_ID_ASUSTEK_T100TAF_KEYBOARD),

	  QUIRK_T100_KEYBOARD | QUIRK_NO_CONSUMER_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,

		USB_DEVICE_ID_ASUSTEK_T101HA_KEYBOARD), QUIRK_T101HA_DOCK },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_ASUS_AK1D) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_ASUS_MD_5110) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_JESS, USB_DEVICE_ID_ASUS_MD_5112) },
@@ -1249,6 +1241,12 @@ static const struct hid_device_id asus_devices[] = { 
		USB_DEVICE_ID_ASUSTEK_T100CHI_KEYBOARD), QUIRK_T100CHI },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ITE, USB_DEVICE_ID_ITE_MEDION_E1239T),

		QUIRK_MEDION_E1239T },

	/*

	 * Note bind to the HID_GROUP_GENERIC group, so that we only bind to the keyboard

	 * part, while letting hid-multitouch.c handle the touchpad.

	 */

	{ HID_DEVICE(BUS_USB, HID_GROUP_GENERIC,

		USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_T101HA_KEYBOARD) },

	{ }

};

MODULE_DEVICE_TABLE(hid, asus_devices);