]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
USB: gadget rndis: stop windows self-immolation
authorDavid Brownell <dbrownell@users.sourceforge.net>
Sun, 16 Nov 2008 03:53:21 +0000 (19:53 -0800)
committerGreg Kroah-Hartman <gregkh@kvm.kroah.org>
Thu, 20 Nov 2008 06:01:34 +0000 (22:01 -0800)
Somewhere in the conversion of the RNDIS gadget code to the new
framework, the descriptor of its data interface seems to have
been copied from the CDC Ethernet driver.  Unfortunately that
means it got a nonzero altsetting ... which is incorrect.  Issue
uncovered by Richard Röjfors <richard.rojfors@endian.se>.

This patch fixes that problem, and resolves at least some cases
of Windows XP bluescreening itself.

Tested-by: Richard Röjfors <richard.rojfors@endian.se>.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/gadget/f_rndis.c

index 659b3d9671c4fe3f0f31220cb4b3bde514d88d2b..8afb14a4a72f2bd20d51bf6f1eba357dee147a0f 100644 (file)
@@ -172,7 +172,6 @@ static struct usb_interface_descriptor rndis_data_intf __initdata = {
        .bDescriptorType =      USB_DT_INTERFACE,
 
        /* .bInterfaceNumber = DYNAMIC */
-       .bAlternateSetting =    1,
        .bNumEndpoints =        2,
        .bInterfaceClass =      USB_CLASS_CDC_DATA,
        .bInterfaceSubClass =   0,