summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaulik Mankad <x0082077@ti.com>2009-05-29 18:34:40 +0530
committerGreg Kroah-Hartman <gregkh@suse.de>2009-06-15 21:44:46 -0700
commit830d1b188c997c4af094d4e20b194205ddbded13 (patch)
treebc48630bde285533656ffd95138de462ab8e8856
parent1f17c5026ce27d0449903d34f9fca461a45fe1cb (diff)
downloadop-kernel-dev-830d1b188c997c4af094d4e20b194205ddbded13.zip
op-kernel-dev-830d1b188c997c4af094d4e20b194205ddbded13.tar.gz
USB: gadget : Fix RNDIS code to pass USB Compliance tests (USBCV) with g_ether
This patch fixes a bug in the RNDIS code. Due to this bug gether_connect() fails as the port remains un-initialized. As a result following USB Compliance Tests were failing. (1)EndpointDescriptorTest_DeviceConfigured (2)Interface Descriptor Test. (3)Halt Endpoint Test. (4)SetConfigurationTest The fix aligns rndis code with the CDC ECM for xxx_set_alt(). The above listed USB Compliance test passes with this fix. Tested working fine on SDP with OMAP 3430. Signed-off-by: Maulik Mankad <x0082077@ti.com> CC: David Brownell <david-b@pacbell.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/gadget/f_rndis.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/gadget/f_rndis.c b/drivers/usb/gadget/f_rndis.c
index 3279a47..424a37c 100644
--- a/drivers/usb/gadget/f_rndis.c
+++ b/drivers/usb/gadget/f_rndis.c
@@ -475,7 +475,9 @@ static int rndis_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
if (rndis->port.in_ep->driver_data) {
DBG(cdev, "reset rndis\n");
gether_disconnect(&rndis->port);
- } else {
+ }
+
+ if (!rndis->port.in) {
DBG(cdev, "init rndis\n");
rndis->port.in = ep_choose(cdev->gadget,
rndis->hs.in, rndis->fs.in);
OpenPOWER on IntegriCloud