From 0d8ada12e3324495d99b48ea95e51a7099405e34 Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Tue, 20 Apr 2010 10:40:59 -0400 Subject: [PATCH] --- yaml --- r: 190454 b: refs/heads/master c: 62f9cfa3ece58268b3e92ca59c23b175f86205aa h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/generic.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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;