From 95e1d303ec51f8f3c218ff5c0d657adbe4c5f83d Mon Sep 17 00:00:00 2001 From: Jiri Kosina Date: Sun, 2 Sep 2012 09:28:51 +0200 Subject: [PATCH] --- yaml --- r: 323473 b: refs/heads/master c: 00315e4f5343bf8b0858f840884f6e19464698c7 h: refs/heads/master i: 323471: b8a6d4f3c85eed5b22cb534fc63ead226ea8e5dc v: v3 --- [refs] | 2 +- trunk/drivers/hid/hid-core.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b72aad84ca99..b6ba72bdc8a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66a61fc0b2c3475f26f65b5f29ed5945b8efbf9e +refs/heads/master: 00315e4f5343bf8b0858f840884f6e19464698c7 diff --git a/trunk/drivers/hid/hid-core.c b/trunk/drivers/hid/hid-core.c index fa5fcca16a9a..8d3946af9ff6 100644 --- a/trunk/drivers/hid/hid-core.c +++ b/trunk/drivers/hid/hid-core.c @@ -1447,7 +1447,14 @@ void hid_disconnect(struct hid_device *hdev) } EXPORT_SYMBOL_GPL(hid_disconnect); -/* a list of devices for which there is a specialized driver on HID bus */ +/* + * A list of devices for which there is a specialized driver on HID bus. + * + * Please note that for multitouch devices (driven by hid-multitouch driver), + * there is a proper autodetection and autoloading in place (based on presence + * of HID_DG_CONTACTID), so those devices don't need to be added to this list, + * as we are doing the right thing in hid_scan_usage(). + */ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU) }, { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) },