]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
HID: wacom - Cleanup input_capabilities for Graphire 4 and Bamboo Fun
authorPing Cheng <pinglinux@gmail.com>
Tue, 18 Nov 2014 21:28:37 +0000 (13:28 -0800)
committerJiri Kosina <jkosina@suse.cz>
Thu, 20 Nov 2014 16:28:42 +0000 (17:28 +0100)
Graphire 4 only has two tablet buttons; Bamboo Fun touch ring is only
for PAD.

Signed-off-by: Ping Cheng <pingc@wacom.com>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/wacom_wac.c

index 63821c0e8207164cab4e0b8ddea49bc36e907d39..51c7353e01a52b99ab84b1968cf36c41d193ee72 100644 (file)
@@ -2050,9 +2050,6 @@ int wacom_setup_input_capabilities(struct input_dev *input_dev,
 
        switch (features->type) {
        case WACOM_MO:
-               input_set_abs_params(input_dev, ABS_WHEEL, 0, 71, 0, 0);
-               /* fall through */
-
        case WACOM_G4:
                /* fall through */
 
@@ -2306,9 +2303,7 @@ int wacom_setup_pad_input_capabilities(struct input_dev *input_dev,
 
        case WACOM_G4:
                __set_bit(BTN_BACK, input_dev->keybit);
-               __set_bit(BTN_LEFT, input_dev->keybit);
                __set_bit(BTN_FORWARD, input_dev->keybit);
-               __set_bit(BTN_RIGHT, input_dev->keybit);
                input_set_capability(input_dev, EV_REL, REL_WHEEL);
                break;