Commit 5f1e8ce7 authored Mar 17, 2011 by Hema HK Committed by Greg Kroah-Hartman Mar 23, 2011

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>

parent b5a3b3d9

drivers/usb/musb/musb_gadget.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -1880,11 +1880,11 @@ 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);
		}

		hcd->self.uses_pio_for_control = 1;