diff options
| author | Preetham Chandru <pchandru@nvidia.com> | 2012-02-15 20:09:38 +0530 |
|---|---|---|
| committer | Lokesh Pathak <lpathak@nvidia.com> | 2012-02-22 22:14:23 -0800 |
| commit | 73dd1497bd101d10a3dd980915a8d3899d8ba5c4 (patch) | |
| tree | 10ab88917a1589f462f5568f8c1541f34f2c4679 /drivers/usb | |
| parent | eecc9e8b5739e7d148eed9b75623b513024cd3ff (diff) | |
usb: gadget: fsl_udc: avoid can_pullup function in vbus_session
avoid making a call to can_pullup function in vbus_session for non-android
gadget drivers. The mass storage gadget driver assumes that the UDCs
start with data pullup connected and the mass storage gadget
driver do not make an explicit call to usb_gadget_connect.
Signed-off-by: Preetham Chandru R <pchandru@nvidia.com>
Bug 922561
Change-Id: Ifad305db861caf27b1d9c8e541c2480bb1536b6b
Reviewed-on: http://git-master/r/80076
Reviewed-by: Rakesh Bodla <rbodla@nvidia.com>
Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/gadget/fsl_udc_core.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c index 28bb1883b81a..8d917006e98b 100644 --- a/drivers/usb/gadget/fsl_udc_core.c +++ b/drivers/usb/gadget/fsl_udc_core.c @@ -1402,6 +1402,10 @@ static int fsl_vbus_session(struct usb_gadget *gadget, int is_active) schedule_delayed_work(&udc->work, USB_CHARGER_DETECTION_WAIT_TIME_MS); } + +#ifndef CONFIG_USB_G_ANDROID + return 0; +#endif } spin_lock_irqsave(&udc->lock, flags); |