Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bcopeland...

[linux-block.git] / drivers / usb / core / generic.c

diff --git a/drivers/usb/core/generic.c b/drivers/usb/core/generic.c
index 9a34ccb0a1c027f68abf478eec8f588d566a3bb9..69ecd3c923112bc5809ee163b154413aa17c7e77 100644 (file)
--- a/drivers/usb/core/generic.c
+++ b/drivers/usb/core/generic.c
@@ -105,8 +105,10 @@ int usb_choose_configuration(struct usb_device *udev)
                /* When the first config's first interface is one of Microsoft's
                 * pet nonstandard Ethernet-over-USB protocols, ignore it unless
                 * this kernel has enabled the necessary host side driver.
+                * But: Don't ignore it if it's the only config.
                 */
-               if (i == 0 && desc && (is_rndis(desc) || is_activesync(desc))) {
+               if (i == 0 && num_configs > 1 && desc &&
+                               (is_rndis(desc) || is_activesync(desc))) {
 #if !defined(CONFIG_USB_NET_RNDIS_HOST) && !defined(CONFIG_USB_NET_RNDIS_HOST_MODULE)
                        continue;
 #else