Merge 3.12-rc6 into usb-next.
We want those USB fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
@@ -1853,11 +1853,14 @@ static int musb_gadget_start(struct usb_gadget *g,
|
||||
musb->gadget_driver = driver;
|
||||
|
||||
spin_lock_irqsave(&musb->lock, flags);
|
||||
musb->is_active = 1;
|
||||
|
||||
otg_set_peripheral(otg, &musb->g);
|
||||
musb->xceiv->state = OTG_STATE_B_IDLE;
|
||||
spin_unlock_irqrestore(&musb->lock, flags);
|
||||
|
||||
musb_start(musb);
|
||||
|
||||
/* REVISIT: funcall to other code, which also
|
||||
* handles power budgeting ... this way also
|
||||
* ensures HdrcStart is indirectly called.
|
||||
|
Reference in New Issue
Block a user