diff --git a/[refs] b/[refs] index ae842fda58a6..faf57805977b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3baa19b0a9b711b02cec81d9fea33b7b9628957 +refs/heads/master: 62f9cfa3ece58268b3e92ca59c23b175f86205aa diff --git a/trunk/drivers/usb/core/generic.c b/trunk/drivers/usb/core/generic.c index bdf87a8414a1..2c95153c0f24 100644 --- a/trunk/drivers/usb/core/generic.c +++ b/trunk/drivers/usb/core/generic.c @@ -120,7 +120,7 @@ int usb_choose_configuration(struct usb_device *udev) * than a vendor-specific driver. */ else if (udev->descriptor.bDeviceClass != USB_CLASS_VENDOR_SPEC && - (!desc || desc->bInterfaceClass != + (desc && desc->bInterfaceClass != USB_CLASS_VENDOR_SPEC)) { best = c; break;