diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-10-20 11:26:33 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-10-20 11:26:33 -0700 |
| commit | 09147a74376428080eddfed0cbce2cab205c2508 (patch) | |
| tree | 7c903b82831eb03498dfc89c615e2acd5e1d9d6f /drivers/usb/gadget/udc/udc-core.c | |
| parent | e4bec9707eb7446e0cd1961f91e6948819327933 (diff) | |
| parent | c2fab09b2ec32f252029757ba3353ea3d308c811 (diff) | |
Merge branch 'test/linux-linaro-lsk-v3.18-android' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-v3.18-androidlsk-v3.18-15.10-android
Diffstat (limited to 'drivers/usb/gadget/udc/udc-core.c')
| -rw-r--r-- | drivers/usb/gadget/udc/udc-core.c | 10 |
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 59beaf95e14f..5442febcd7af 100644 --- a/drivers/usb/gadget/udc/udc-core.c +++ b/drivers/usb/gadget/udc/udc-core.c @@ -401,15 +401,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; |