mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 01:10:04 +00:00
Input: wacom - TPC2FG doesn't store touch id for slots
Signed-off-by: Ping Cheng <pingc@wacom.com> Tested-by: Rafi Rubin <rafi@seas.upenn.edu> Reviewed-by: Jason Gerecke <killertofu@gmail.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
parent
adad004e1a
commit
6795a524f0
1 changed files with 4 additions and 2 deletions
|
@ -1547,10 +1547,8 @@ int wacom_setup_input_capabilities(struct input_dev *input_dev,
|
||||||
__set_bit(INPUT_PROP_POINTER, input_dev->propbit);
|
__set_bit(INPUT_PROP_POINTER, input_dev->propbit);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case TABLETPC2FG:
|
|
||||||
case MTSCREEN:
|
case MTSCREEN:
|
||||||
if (features->device_type == BTN_TOOL_FINGER) {
|
if (features->device_type == BTN_TOOL_FINGER) {
|
||||||
|
|
||||||
wacom_wac->slots = kmalloc(features->touch_max *
|
wacom_wac->slots = kmalloc(features->touch_max *
|
||||||
sizeof(int),
|
sizeof(int),
|
||||||
GFP_KERNEL);
|
GFP_KERNEL);
|
||||||
|
@ -1559,7 +1557,11 @@ int wacom_setup_input_capabilities(struct input_dev *input_dev,
|
||||||
|
|
||||||
for (i = 0; i < features->touch_max; i++)
|
for (i = 0; i < features->touch_max; i++)
|
||||||
wacom_wac->slots[i] = -1;
|
wacom_wac->slots[i] = -1;
|
||||||
|
}
|
||||||
|
/* fall through */
|
||||||
|
|
||||||
|
case TABLETPC2FG:
|
||||||
|
if (features->device_type == BTN_TOOL_FINGER) {
|
||||||
input_mt_init_slots(input_dev, features->touch_max);
|
input_mt_init_slots(input_dev, features->touch_max);
|
||||||
input_set_abs_params(input_dev, ABS_MT_TOOL_TYPE,
|
input_set_abs_params(input_dev, ABS_MT_TOOL_TYPE,
|
||||||
0, MT_TOOL_MAX, 0, 0);
|
0, MT_TOOL_MAX, 0, 0);
|
||||||
|
|
Loading…
Reference in a new issue