aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-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 364f2c3432ff..8f3b30b781fa 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,
517 goto out; 517 goto out;
518 } 518 }
519 519
520 if (usb_get_extra_descriptor(interface, HID_DEVICET_HID, &hid_desc)) { 520 error = usb_get_extra_descriptor(interface, HID_DEVICET_HID, &hid_desc);
521 if (usb_get_extra_descriptor(&interface->endpoint[0], 521 if (error) {
522 HID_DEVICET_REPORT, &hid_desc)) { 522 error = usb_get_extra_descriptor(&interface->endpoint[0],
523 printk("wacom: can not retrieve extra class descriptor\n"); 523 HID_DEVICET_REPORT, &hid_desc);
524 error = 1; 524 if (error) {
525 printk(KERN_ERR "wacom: can not retrieve extra class descriptor\n");
525 goto out; 526 goto out;
526 } 527 }
527 } 528 }