Input: wacom - simplify type check for newer V5 devices
authorPing Cheng <pinglinux@gmail.com>
Wed, 21 Nov 2012 21:12:16 +0000 (13:12 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 21 Nov 2012 21:22:06 +0000 (13:22 -0800)
The updated type enum enables this implementation.

Signed-off-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/tablet/wacom_wac.c

index 7554a043ee46e4fac768ce4cf451bdbcee9a2d0e..a257212ad640221220c565ab329c20ca63da0b50 100644 (file)
@@ -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);