diff options
-rw-r--r-- | drivers/input/tablet/wacom_wac.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c index 4453864956b6..6533f44be5bd 100644 --- a/drivers/input/tablet/wacom_wac.c +++ b/drivers/input/tablet/wacom_wac.c | |||
@@ -1547,10 +1547,8 @@ int wacom_setup_input_capabilities(struct input_dev *input_dev, | |||
1547 | __set_bit(INPUT_PROP_POINTER, input_dev->propbit); | 1547 | __set_bit(INPUT_PROP_POINTER, input_dev->propbit); |
1548 | break; | 1548 | break; |
1549 | 1549 | ||
1550 | case TABLETPC2FG: | ||
1551 | case MTSCREEN: | 1550 | case MTSCREEN: |
1552 | if (features->device_type == BTN_TOOL_FINGER) { | 1551 | if (features->device_type == BTN_TOOL_FINGER) { |
1553 | |||
1554 | wacom_wac->slots = kmalloc(features->touch_max * | 1552 | wacom_wac->slots = kmalloc(features->touch_max * |
1555 | sizeof(int), | 1553 | sizeof(int), |
1556 | GFP_KERNEL); | 1554 | GFP_KERNEL); |
@@ -1559,7 +1557,11 @@ int wacom_setup_input_capabilities(struct input_dev *input_dev, | |||
1559 | 1557 | ||
1560 | for (i = 0; i < features->touch_max; i++) | 1558 | for (i = 0; i < features->touch_max; i++) |
1561 | wacom_wac->slots[i] = -1; | 1559 | wacom_wac->slots[i] = -1; |
1560 | } | ||
1561 | /* fall through */ | ||
1562 | 1562 | ||
1563 | case TABLETPC2FG: | ||
1564 | if (features->device_type == BTN_TOOL_FINGER) { | ||
1563 | input_mt_init_slots(input_dev, features->touch_max); | 1565 | input_mt_init_slots(input_dev, features->touch_max); |
1564 | input_set_abs_params(input_dev, ABS_MT_TOOL_TYPE, | 1566 | input_set_abs_params(input_dev, ABS_MT_TOOL_TYPE, |
1565 | 0, MT_TOOL_MAX, 0, 0); | 1567 | 0, MT_TOOL_MAX, 0, 0); |