Skip to content

Commit

Permalink
Input: wacom - TPC2FG doesn't store touch id for slots
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ping Cheng authored and Dmitry Torokhov committed Jun 28, 2012
1 parent adad004 commit 6795a52
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/input/tablet/wacom_wac.c
Original file line number Diff line number Diff line change
Expand Up @@ -1547,10 +1547,8 @@ int wacom_setup_input_capabilities(struct input_dev *input_dev,
__set_bit(INPUT_PROP_POINTER, input_dev->propbit);
break;

case TABLETPC2FG:
case MTSCREEN:
if (features->device_type == BTN_TOOL_FINGER) {

wacom_wac->slots = kmalloc(features->touch_max *
sizeof(int),
GFP_KERNEL);
Expand All @@ -1559,7 +1557,11 @@ int wacom_setup_input_capabilities(struct input_dev *input_dev,

for (i = 0; i < features->touch_max; i++)
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_set_abs_params(input_dev, ABS_MT_TOOL_TYPE,
0, MT_TOOL_MAX, 0, 0);
Expand Down

0 comments on commit 6795a52

Please sign in to comment.