Hi, On Thu, Mar 17, 2011 at 11:10:11AM +0530, Hema Kalliguddi wrote: > >diff --git a/drivers/usb/musb/musb_gadget.c > >b/drivers/usb/musb/musb_gadget.c > >index 0f59bf9..95fbacc 100644 > >--- a/drivers/usb/musb/musb_gadget.c > >+++ b/drivers/usb/musb/musb_gadget.c > >@@ -1877,6 +1877,10 @@ 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); > > } > > There is a merge issue with this patch. The above change has to be outside > the error check loop. > It should be like > > 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); > > Do you want me to send the patch or you will resolve it? please, send a patch. -- balbi -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html