diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-11 10:03:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-11 10:03:19 -0700 |
| commit | 6af0b78cf0d3b5b39fcd892e532e567b12b32b37 (patch) | |
| tree | b1ef19838639d445670d5b9b62832bf30ae32444 | |
| parent | 58d79e7141e4f5e4006089eabeec0eadef6e409e (diff) | |
| parent | ca047fedd89bbb4b79b61e0656a7b799e4e45e6d (diff) | |
| download | kernel_samsung_espresso10-6af0b78cf0d3b5b39fcd892e532e567b12b32b37.zip kernel_samsung_espresso10-6af0b78cf0d3b5b39fcd892e532e567b12b32b37.tar.gz kernel_samsung_espresso10-6af0b78cf0d3b5b39fcd892e532e567b12b32b37.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: wacom - fix pressure in Cintiq 21UX2
| -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 6e29bad..47fd7a0 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)); |