summaryrefslogtreecommitdiffstats
path: root/drivers/usb/musb/musb_gadget.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-24 10:02:55 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-24 10:02:55 -0700
commitb4a41ed24c858d75985c7dcba685715fdf2e6114 (patch)
tree04a28143a4b6ce37fdca3106dabfae713315184c /drivers/usb/musb/musb_gadget.c
parent76d21c563569bcea6bc67d65cc2c460cff643058 (diff)
parent7e7797e7f6f7bfab73fca02c65e40eaa5bb9000c (diff)
Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: USB: cdc-acm: fix potential null-pointer dereference on disconnect USB: cdc-acm: fix potential null-pointer dereference USB: cdc-acm: fix memory corruption / panic USB: Fix 'bad dma' problem on WDM device disconnect usb: wwan: fix compilation without CONFIG_PM_RUNTIME USB: uss720 fixup refcount position usb: musb: blackfin: fix typo in new bfin_musb_vbus_status func usb: musb: blackfin: fix typo in new dev_pm_ops struct usb: musb: blackfin: fix typo in platform driver name usb: musb: Fix for merge issue ehci-hcd: Bug fix: don't set a QH's Halt bit USB: Do not pass negative length to snoop_urb()
Diffstat (limited to 'drivers/usb/musb/musb_gadget.c')
-rw-r--r--drivers/usb/musb/musb_gadget.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index 5c7b321d395..98519c5d8b5 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)