From df0422ee2e810f5bbfe813bee777e4c69acf8db5 Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Wed, 2 May 2012 00:13:38 -0700 Subject: [PATCH] --- yaml --- r: 306603 b: refs/heads/master c: a882c932a628cbab17752fc8b1c94692f95bbf9a h: refs/heads/master i: 306601: 6cf95ac324366770c5799217f871ba43f3beda97 306599: e94ff2bacd8f143926ddf680b339c7ffd68f61c7 v: v3 --- [refs] | 2 +- trunk/drivers/input/tablet/wacom_sys.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 7d9deb12cd45..36260c495fff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0c9e300adec668fd323b0e79c85b9136fccab649 +refs/heads/master: a882c932a628cbab17752fc8b1c94692f95bbf9a diff --git a/trunk/drivers/input/tablet/wacom_sys.c b/trunk/drivers/input/tablet/wacom_sys.c index 364f2c3432ff..8f3b30b781fa 100644 --- a/trunk/drivers/input/tablet/wacom_sys.c +++ b/trunk/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; } }