aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorPing Cheng <pinglinux@gmail.com>2011-06-22 04:02:51 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-06-22 04:25:59 -0400
commit71c86ce59791bcd67af937bbea719a508079d7c2 (patch)
tree6b28cc4706096c9313bd2258345488b5ff019c0c /drivers/input
parentfabadbc754cf461e8d68e5f8ff53f287dcee41b2 (diff)
Input: wacom - Cintiq 21UX2 does not have menu strips
So don't set ABS_RX/ABS_RY for them. Signed-off-by: Ping Cheng <pingc@wacom.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/tablet/wacom_wac.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index 08ba5ad9c9be..cc6c917e1164 100644
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@ -1129,8 +1129,11 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev,
1129 __set_bit(BTN_0 + i, input_dev->keybit); 1129 __set_bit(BTN_0 + i, input_dev->keybit);
1130 __set_bit(BTN_TOOL_FINGER, input_dev->keybit); 1130 __set_bit(BTN_TOOL_FINGER, input_dev->keybit);
1131 1131
1132 input_set_abs_params(input_dev, ABS_RX, 0, 4096, 0, 0); 1132 if (wacom_wac->features.type != WACOM_21UX2) {
1133 input_set_abs_params(input_dev, ABS_RY, 0, 4096, 0, 0); 1133 input_set_abs_params(input_dev, ABS_RX, 0, 4096, 0, 0);
1134 input_set_abs_params(input_dev, ABS_RY, 0, 4096, 0, 0);
1135 }
1136
1134 input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0); 1137 input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0);
1135 wacom_setup_cintiq(wacom_wac); 1138 wacom_setup_cintiq(wacom_wac);
1136 break; 1139 break;