diff options
-rw-r--r-- | drivers/hid/hid-multitouch.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index c4d89830cd1f..f05d372ba71e 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c | |||
@@ -380,7 +380,6 @@ static const struct attribute_group mt_attribute_group = { | |||
380 | 380 | ||
381 | static void mt_get_feature(struct hid_device *hdev, struct hid_report *report) | 381 | static void mt_get_feature(struct hid_device *hdev, struct hid_report *report) |
382 | { | 382 | { |
383 | struct mt_device *td = hid_get_drvdata(hdev); | ||
384 | int ret, size = hid_report_len(report); | 383 | int ret, size = hid_report_len(report); |
385 | u8 *buf; | 384 | u8 *buf; |
386 | 385 | ||
@@ -388,7 +387,7 @@ static void mt_get_feature(struct hid_device *hdev, struct hid_report *report) | |||
388 | * Do not fetch the feature report if the device has been explicitly | 387 | * Do not fetch the feature report if the device has been explicitly |
389 | * marked as non-capable. | 388 | * marked as non-capable. |
390 | */ | 389 | */ |
391 | if (td->initial_quirks & HID_QUIRK_NO_INIT_REPORTS) | 390 | if (hdev->quirks & HID_QUIRK_NO_INIT_REPORTS) |
392 | return; | 391 | return; |
393 | 392 | ||
394 | buf = hid_alloc_report_buf(report, GFP_KERNEL); | 393 | buf = hid_alloc_report_buf(report, GFP_KERNEL); |
@@ -1470,21 +1469,6 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id) | |||
1470 | */ | 1469 | */ |
1471 | hdev->quirks |= HID_QUIRK_MULTI_INPUT; | 1470 | hdev->quirks |= HID_QUIRK_MULTI_INPUT; |
1472 | 1471 | ||
1473 | /* | ||
1474 | * Some multitouch screens do not like to be polled for input | ||
1475 | * reports. Fortunately, the Win8 spec says that all touches | ||
1476 | * should be sent during each report, making the initialization | ||
1477 | * of input reports unnecessary. For Win7 devices, well, let's hope | ||
1478 | * they will still be happy (this is only be a problem if a touch | ||
1479 | * was already there while probing the device). | ||
1480 | * | ||
1481 | * In addition some touchpads do not behave well if we read | ||
1482 | * all feature reports from them. Instead we prevent | ||
1483 | * initial report fetching and then selectively fetch each | ||
1484 | * report we are interested in. | ||
1485 | */ | ||
1486 | hdev->quirks |= HID_QUIRK_NO_INIT_REPORTS; | ||
1487 | |||
1488 | timer_setup(&td->release_timer, mt_expired_timeout, 0); | 1472 | timer_setup(&td->release_timer, mt_expired_timeout, 0); |
1489 | 1473 | ||
1490 | ret = hid_parse(hdev); | 1474 | ret = hid_parse(hdev); |