diff options
| author | Neil Zhang <zhangwm@marvell.com> | 2012-07-10 10:07:07 +0800 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2012-08-23 11:04:17 +0300 |
| commit | 11c37c8b64b9d9d4ab19d387e6028eee3ec188d3 (patch) | |
| tree | c346f8d7afdcdc22deac0b18e1cd627cc83fce31 | |
| parent | 1dcaa252fdf01e4ba49ece156812043baf01c7cc (diff) | |
| download | linux-3.10-11c37c8b64b9d9d4ab19d387e6028eee3ec188d3.tar.gz linux-3.10-11c37c8b64b9d9d4ab19d387e6028eee3ec188d3.tar.bz2 linux-3.10-11c37c8b64b9d9d4ab19d387e6028eee3ec188d3.zip | |
usb: gadget: mv_udc: fix boot up hang
Fix boot up hang when enable udc without otg enabled.
The root cause is that the clock will be shut down when probe routine is
finished because of clock gating. When a gadget driver is registered at
this time, it will call mv_udc_start which in turn will call
mv_udc_vbus_session. If there is no cable attached at the boot up time,
the vbus is low, so it will call stop_activity path without clock
enabled which will cause system hang then.
Actually, we need't go this path when clock is disabled, what we need to
do is just jump out.
Signed-off-by: Neil Zhang <zhangwm@marvell.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
| -rw-r--r-- | drivers/usb/gadget/mv_udc_core.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/gadget/mv_udc_core.c b/drivers/usb/gadget/mv_udc_core.c index 58edff9abce..ad91de4d60d 100644 --- a/drivers/usb/gadget/mv_udc_core.c +++ b/drivers/usb/gadget/mv_udc_core.c @@ -1221,12 +1221,16 @@ static int mv_udc_vbus_session(struct usb_gadget *gadget, int is_active) udc_start(udc); } } else if (udc->driver && udc->softconnect) { + if (!udc->active) + goto out; + /* stop all the transfer in queue*/ stop_activity(udc, udc->driver); udc_stop(udc); mv_udc_disable(udc); } +out: spin_unlock_irqrestore(&udc->lock, flags); return retval; } |