summaryrefslogtreecommitdiffstats
path: root/drivers/input/tablet
diff options
context:
space:
mode:
authorPing Cheng <pinglinux@gmail.com>2011-06-22 01:02:51 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-06-22 01:25:59 -0700
commit71c86ce59791bcd67af937bbea719a508079d7c2 (patch)
tree6b28cc4706096c9313bd2258345488b5ff019c0c /drivers/input/tablet
parentfabadbc754cf461e8d68e5f8ff53f287dcee41b2 (diff)
downloadop-kernel-dev-71c86ce59791bcd67af937bbea719a508079d7c2.zip
op-kernel-dev-71c86ce59791bcd67af937bbea719a508079d7c2.tar.gz
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/tablet')
-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 08ba5ad..cc6c917 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,
__set_bit(BTN_0 + i, input_dev->keybit);
__set_bit(BTN_TOOL_FINGER, input_dev->keybit);
- input_set_abs_params(input_dev, ABS_RX, 0, 4096, 0, 0);
- input_set_abs_params(input_dev, ABS_RY, 0, 4096, 0, 0);
+ if (wacom_wac->features.type != WACOM_21UX2) {
+ input_set_abs_params(input_dev, ABS_RX, 0, 4096, 0, 0);
+ input_set_abs_params(input_dev, ABS_RY, 0, 4096, 0, 0);
+ }
+
input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0);
wacom_setup_cintiq(wacom_wac);
break;
OpenPOWER on IntegriCloud