Skip to content

Commit

Permalink
HID: multitouch: change touch sensor detection in mt_input_configured()
Browse files Browse the repository at this point in the history
To implement different methods for pen and touch, the previous
implementation has to be reworked.

This detection of the input attached to the touch sensor is the same
than the one used in mt_report().

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
  • Loading branch information
Benjamin Tissoires authored and Jiri Kosina committed Mar 27, 2013
1 parent 6f492f2 commit 5b6498a
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions drivers/hid/hid-multitouch.c
Original file line number Diff line number Diff line change
Expand Up @@ -857,13 +857,10 @@ static void mt_post_parse(struct mt_device *td)

static void mt_input_configured(struct hid_device *hdev, struct hid_input *hi)
{
struct input_dev *input = hi->input;

/* Only initialize slots for MT input devices */
if (!test_bit(ABS_MT_POSITION_X, input->absbit))
return;
struct mt_device *td = hid_get_drvdata(hdev);

mt_touch_input_configured(hdev, hi);
if (hi->report->id == td->mt_report_id)
mt_touch_input_configured(hdev, hi);
}

static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
Expand Down

0 comments on commit 5b6498a

Please sign in to comment.