Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 361866
b: refs/heads/master
c: 4c43755
h: refs/heads/master
v: v3
  • Loading branch information
Benjamin Tissoires authored and Jiri Kosina committed Mar 27, 2013
1 parent 241efda commit 0ba4a1d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 570637dc8eeb2faba06228d497ff40bb019bcc93
refs/heads/master: 4c43755506ececbe903585265aa8408e937620a1
6 changes: 5 additions & 1 deletion trunk/drivers/hid/hid-multitouch.c
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,7 @@ static void mt_process_mt_event(struct hid_device *hid, struct hid_field *field,
{
struct mt_device *td = hid_get_drvdata(hid);
__s32 quirks = td->mtclass.quirks;
struct input_dev *input = field->hidinput->input;

if (hid->claimed & HID_CLAIMED_INPUT) {
switch (usage->hid) {
Expand Down Expand Up @@ -670,13 +671,16 @@ static void mt_process_mt_event(struct hid_device *hid, struct hid_field *field,
break;

default:
if (usage->type)
input_event(input, usage->type, usage->code,
value);
return;
}

if (usage->usage_index + 1 == field->report_count) {
/* we only take into account the last report. */
if (usage->hid == td->last_slot_field)
mt_complete_slot(td, field->hidinput->input);
mt_complete_slot(td, input);

if (field->index == td->last_field_index
&& td->num_received >= td->num_expected)
Expand Down

0 comments on commit 0ba4a1d

Please sign in to comment.