diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-10-18 06:20:19 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-10-18 06:20:19 +0200 |
| commit | 3136baf8d09458bb04332b81494fd13ad90fe94a (patch) | |
| tree | 6593ef5894597bf6224cf0374e4d49b1499d347d /drivers/input/tablet/wacom_wac.c | |
| parent | Input: ad7877 - filter events where pressure is beyond the maximum (diff) | |
| parent | Input: wacom - fix pressure in Cintiq 21UX2 (diff) | |
| download | linux-3136baf8d09458bb04332b81494fd13ad90fe94a.tar.xz linux-3136baf8d09458bb04332b81494fd13ad90fe94a.zip | |
Merge branch 'for-linus' into next
Diffstat (limited to 'drivers/input/tablet/wacom_wac.c')
| -rw-r--r-- | drivers/input/tablet/wacom_wac.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c index e1b65ba84438..121fdf7a73d2 100644 --- a/drivers/input/tablet/wacom_wac.c +++ b/drivers/input/tablet/wacom_wac.c @@ -442,8 +442,10 @@ static void wacom_intuos_general(struct wacom_wac *wacom) /* general pen packet */ if ((data[1] & 0xb8) == 0xa0) { t = (data[6] << 2) | ((data[7] >> 6) & 3); - if (features->type >= INTUOS4S && features->type <= INTUOS4L) + if ((features->type >= INTUOS4S && features->type <= INTUOS4L) || + features->type == WACOM_21UX2) { t = (t << 1) | (data[1] & 1); + } input_report_abs(input, ABS_PRESSURE, t); input_report_abs(input, ABS_TILT_X, ((data[7] << 1) & 0x7e) | (data[8] >> 7)); |