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>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index 5c7b321d3959..98519c5d8b5c 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -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)