aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Pundir <amit.pundir@linaro.org>2015-09-30 13:14:41 +0530
committerBadhri Jagan Sridharan <badhri@google.com>2015-09-30 19:18:31 +0000
commite8205bb08bb7390609ef08cae49455954d7d93f1 (patch)
tree92be580b7a84708fc55e97cd4d3eea1e57ad34be
parentdbd204200c68d8bd4a6561cf471df5293546441a (diff)
downloadlinux-linaro-stable-e8205bb08bb7390609ef08cae49455954d7d93f1.tar.gz
Revert "HACK: usb: gadget: Fix enumeration on boot"
Apparently we do not need this hack on Android ConfigFS gadgets. This reverts commit 2896b2909fa0655265eec0f743baae592d8d52be. Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
-rw-r--r--drivers/usb/gadget/udc/udc-core.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/usb/gadget/udc/udc-core.c b/drivers/usb/gadget/udc/udc-core.c
index 382d8b6bfd2a..f2054659f25b 100644
--- a/drivers/usb/gadget/udc/udc-core.c
+++ b/drivers/usb/gadget/udc/udc-core.c
@@ -400,15 +400,7 @@ static int udc_bind_to_driver(struct usb_udc *udc, struct usb_gadget_driver *dri
driver->unbind(udc->gadget);
goto err1;
}
- /*
- * HACK: The Android gadget driver disconnects the gadget
- * on bind and expects the gadget to stay disconnected until
- * it calls usb_gadget_connect when userspace is ready. Remove
- * the call to usb_gadget_connect bellow to avoid enabling the
- * pullup before userspace is ready.
- *
- * usb_gadget_connect(udc->gadget);
- */
+ usb_gadget_connect(udc->gadget);
kobject_uevent(&udc->dev.kobj, KOBJ_CHANGE);
return 0;