HID: wacom - return ENODEV for failed wacom_setup_pad_input_capabilities
authorPing Cheng <pinglinux@gmail.com>
Tue, 18 Nov 2014 21:27:48 +0000 (13:27 -0800)
committerJiri Kosina <jkosina@suse.cz>
Thu, 20 Nov 2014 16:28:42 +0000 (17:28 +0100)
ENODEV indicates no device is added. Hence, the associated pad input device
is simply freed.

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 1048295..63821c0 100644 (file)
@@ -2405,7 +2405,7 @@ int wacom_setup_pad_input_capabilities(struct input_dev *input_dev,
        case INTUOSPS:
                /* touch interface does not have the pad device */
                if (features->device_type != BTN_TOOL_PEN)
-                       return 1;
+                       return -ENODEV;
 
                for (i = 0; i < 7; i++)
                        __set_bit(BTN_0 + i, input_dev->keybit);
@@ -2450,7 +2450,7 @@ int wacom_setup_pad_input_capabilities(struct input_dev *input_dev,
        case BAMBOO_PT:
                /* pad device is on the touch interface */
                if (features->device_type != BTN_TOOL_FINGER)
-                       return 1;
+                       return -ENODEV;
 
                __clear_bit(ABS_MISC, input_dev->absbit);
 
@@ -2463,7 +2463,7 @@ int wacom_setup_pad_input_capabilities(struct input_dev *input_dev,
 
        default:
                /* no pad supported */
-               return 1;
+               return -ENODEV;
        }
        return 0;
 }