summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2012-05-02 00:13:38 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-05-02 00:20:30 -0700
commita882c932a628cbab17752fc8b1c94692f95bbf9a (patch)
tree7429e1dc0f1c1cd036f7e75e1a412cb4380de672 /drivers/input
parent0c9e300adec668fd323b0e79c85b9136fccab649 (diff)
downloadop-kernel-dev-a882c932a628cbab17752fc8b1c94692f95bbf9a.zip
op-kernel-dev-a882c932a628cbab17752fc8b1c94692f95bbf9a.tar.gz
Input: wacom - return proper error if usb_get_extra_descriptor() fails
Instead of returning 1 (which is not even negative) let's capture and return error codde returned by usb_get_extra_descriptor(). Reviewed-by: Chris Bagwell <chris@cnpbagwell.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/tablet/wacom_sys.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
index 364f2c3..8f3b30b 100644
--- a/drivers/input/tablet/wacom_sys.c
+++ b/drivers/input/tablet/wacom_sys.c
@@ -517,11 +517,12 @@ static int wacom_retrieve_hid_descriptor(struct usb_interface *intf,
goto out;
}
- if (usb_get_extra_descriptor(interface, HID_DEVICET_HID, &hid_desc)) {
- if (usb_get_extra_descriptor(&interface->endpoint[0],
- HID_DEVICET_REPORT, &hid_desc)) {
- printk("wacom: can not retrieve extra class descriptor\n");
- error = 1;
+ error = usb_get_extra_descriptor(interface, HID_DEVICET_HID, &hid_desc);
+ if (error) {
+ error = usb_get_extra_descriptor(&interface->endpoint[0],
+ HID_DEVICET_REPORT, &hid_desc);
+ if (error) {
+ printk(KERN_ERR "wacom: can not retrieve extra class descriptor\n");
goto out;
}
}
OpenPOWER on IntegriCloud