Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/usb/core/generic.c b/drivers/usb/core/generic.c
index 05e6d313961e..2c95153c0f24 100644
--- 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 &&
-                                (!desc || desc->bInterfaceClass !=
+                                (desc && desc->bInterfaceClass !=
                                                 USB_CLASS_VENDOR_SPEC)) {
                         best = c;
                         break;
@@ -139,7 +139,7 @@ int usb_choose_configuration(struct usb_device *udev)
 
         if (best) {
                 i = best->desc.bConfigurationValue;
-                dev_info(&udev->dev,
+                dev_dbg(&udev->dev,
                         "configuration #%d chosen from %d choice%s\n",
                         i, num_configs, plural(num_configs));
         } else {