mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 01:10:04 +00:00
usb: musb: Fix for merge issue
There was conflict while merging 2 patches. Enabling vbus code is wrongly moved to error check if loop. This is a fix to resolve the merge issue. Signed-off-by: Hema HK <hemahk@ti.com> Cc: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
b5a3b3d985
commit
5f1e8ce75c
1 changed files with 4 additions and 4 deletions
|
@ -1880,12 +1880,12 @@ int usb_gadget_probe_driver(struct usb_gadget_driver *driver,
|
|||
if (retval < 0) {
|
||||
DBG(1, "add_hcd failed, %d\n", retval);
|
||||
goto err2;
|
||||
|
||||
if ((musb->xceiv->last_event == USB_EVENT_ID)
|
||||
&& musb->xceiv->set_vbus)
|
||||
otg_set_vbus(musb->xceiv, 1);
|
||||
}
|
||||
|
||||
if ((musb->xceiv->last_event == USB_EVENT_ID)
|
||||
&& musb->xceiv->set_vbus)
|
||||
otg_set_vbus(musb->xceiv, 1);
|
||||
|
||||
hcd->self.uses_pio_for_control = 1;
|
||||
|
||||
if (musb->xceiv->last_event == USB_EVENT_NONE)
|
||||
|
|
Loading…
Reference in a new issue