From e6d4a429b0d2a055acf70ca8c068c790ed7f1765 Mon Sep 17 00:00:00 2001 From: Ping Cheng Date: Wed, 22 Jun 2011 01:02:51 -0700 Subject: [PATCH] --- yaml --- r: 260745 b: refs/heads/master c: 71c86ce59791bcd67af937bbea719a508079d7c2 h: refs/heads/master i: 260743: 38b66423769bd10942e92aa3f4696b0eb9da455b v: v3 --- [refs] | 2 +- trunk/drivers/input/tablet/wacom_wac.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7ce553ccf396..288eff065d1f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fabadbc754cf461e8d68e5f8ff53f287dcee41b2 +refs/heads/master: 71c86ce59791bcd67af937bbea719a508079d7c2 diff --git a/trunk/drivers/input/tablet/wacom_wac.c b/trunk/drivers/input/tablet/wacom_wac.c index 08ba5ad9c9be..cc6c917e1164 100644 --- a/trunk/drivers/input/tablet/wacom_wac.c +++ b/trunk/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;