linux-toradex.git/drivers/hid/hid-multitouch.c, branch v3.11

Merge branches 'for-3.11/multitouch', 'for-3.11/sony' and 'for-3.11/upstream' into for-linus

2013-07-04T13:02:26+00:00

Conflicts:
	drivers/hid/hid-core.c

HID: multitouch: prevent memleak with the allocated name

2013-06-12T09:13:38+00:00

mt_free_input_name() was never called during .remove():
hid_hw_stop() removes the hid_input items in hdev->inputs, and so the
list is therefore empty after the call. In the end, we never free the
special names that has been allocated during .probe().

Restore the original name before freeing it to avoid acessing already
freed pointer.

This fixes a regression introduced by 49a5a827a ("HID: multitouch: append " Pen" to
the name of the stylus input")

Signed-off-by: Benjamin Tissoires 
Signed-off-by: Jiri Kosina

HID: remove duplicate ID for D-WAV eGalax 0x7224

2013-05-20T12:48:23+00:00

This patch also removes the duplicate entry in the hid-multitouch.c as
suggested by Benjamin Tissoires.

Signed-off-by: Andy Shevchenko 
Signed-off-by: Jiri Kosina

HID: sort IDs for D-WAV eGalax multitouch devices

2013-05-20T12:48:09+00:00

Just sort the list by IDs. There is no functional change.

Signed-off-by: Andy Shevchenko 
Reviewed-By: Benjamin Tissoires 
Signed-off-by: Jiri Kosina

HID: multitouch: add support for Data Modul easyMaxTouch

2013-05-16T11:28:16+00:00

Add vendor ID for Data Modul and their easyMaxTouch device.
The device has to be configured to multitouch mode prior to using this driver.

Signed-off-by: Steffen Trumtrar 
Signed-off-by: Jiri Kosina

Merge branch 'for-3.10/mt-hybrid-finger-pen' into for-linus

2013-04-30T08:17:48+00:00

Conflicts:
	drivers/hid/hid-multitouch.c

Merge branches 'for-3.10/appleir', 'for-3.10/hid-debug', 'for-3.10/hid-driver-transport-cleanups', 'for-3.10/i2c-hid' and 'for-3.10/logitech' into for-linus

2013-04-30T08:12:44+00:00

HID: multitouch: fix touchpad buttons

2013-03-27T13:09:40+00:00

Commit "HID: multitouch: use the callback "report" instead..." breaks the
buttons of touchpads following the HID multitouch specification.
The buttons were emmitted through hid-input, but as now the events
are generated only in hid-multitouch, the buttons are not emmitted anymore.

The input_event() call is far much simpler than the hid-input one as
many of the different tests do not apply to multitouch touchpads.

Signed-off-by: Benjamin Tissoires 
Signed-off-by: Jiri Kosina

HID: multitouch: force BTN_STYLUS for pen devices

2013-03-27T13:02:47+00:00

The "tablet" udev rule relies on BTN_STYLUS to be set.

Signed-off-by: Benjamin Tissoires 
Signed-off-by: Jiri Kosina

HID: multitouch: append " Pen" to the name of the stylus input

2013-03-27T13:02:47+00:00

This is not just cosmetics, it can help to write udev and X.org
rules.

Signed-off-by: Benjamin Tissoires 
Signed-off-by: Jiri Kosina