diff options
| author | Ping Cheng <pinglinux@gmail.com> | 2012-11-21 13:12:16 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-11-21 13:22:06 -0800 |
| commit | 2ad5169c762e56e4c7a76f517256ce853eb53ad0 (patch) | |
| tree | b29f1cc69f2901a78be0dc55517905c6660a1eb0 /drivers/input | |
| parent | 506ee557b75d4e77f4876ca4189cb855397d617b (diff) | |
| download | talos-op-linux-2ad5169c762e56e4c7a76f517256ce853eb53ad0.tar.gz talos-op-linux-2ad5169c762e56e4c7a76f517256ce853eb53ad0.zip | |
Input: wacom - simplify type check for newer V5 devices
The updated type enum enables this implementation.
Signed-off-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/tablet/wacom_wac.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c index 7554a043ee46..a257212ad640 100644 --- a/drivers/input/tablet/wacom_wac.c +++ b/drivers/input/tablet/wacom_wac.c @@ -467,9 +467,7 @@ 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) || - (features->type >= INTUOS5S && features->type <= INTUOS5L) || - (features->type >= WACOM_21UX2 && features->type <= WACOM_24HD)) { + if (features->type >= INTUOS4S && features->type <= WACOM_24HD) { t = (t << 1) | (data[1] & 1); } input_report_abs(input, ABS_PRESSURE, t); |
