git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'iommu/largepages' into amd-iommu/2.6.35
[pandora-kernel.git]
/
drivers
/
usb
/
core
/
generic.c
diff --git
a/drivers/usb/core/generic.c
b/drivers/usb/core/generic.c
index
bdf87a8
..
2c95153
100644
(file)
--- a/
drivers/usb/core/generic.c
+++ b/
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 &&
* 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;
USB_CLASS_VENDOR_SPEC)) {
best = c;
break;