diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-04 14:22:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-04 14:22:53 -0700 |
| commit | 0ecb063a2976b62d5eaecbd5a70bb994fe4b5a8a (patch) | |
| tree | 2b599cd66f1747d4e246d906b0e240ffd7ed0263 /drivers/usb/musb/musb_gadget.c | |
| parent | bd355f8ae6577aa6b444ab76bb1dfeb1a7002d9f (diff) | |
| parent | 4f0871a6c7811a433513c3788a7cce27033bb8b8 (diff) | |
| download | lwn-0ecb063a2976b62d5eaecbd5a70bb994fe4b5a8a.tar.gz lwn-0ecb063a2976b62d5eaecbd5a70bb994fe4b5a8a.zip | |
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:
xHCI: Clear PLC in xhci_bus_resume()
USB: fix regression in usbip by setting has_tt flag
usb/isp1760: Report correct urb status after unlink
omap:usb: add regulator support for EHCI
mfd: Fix usbhs_enable error handling
usb: musb: gadget: Fix out-of-sync runtime pm calls
usb: musb: omap2430: Fix retention idle on musb peripheral only boards
Diffstat (limited to 'drivers/usb/musb/musb_gadget.c')
| -rw-r--r-- | drivers/usb/musb/musb_gadget.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c index 6dfbf9ffd7a6..f47c20197c61 100644 --- a/drivers/usb/musb/musb_gadget.c +++ b/drivers/usb/musb/musb_gadget.c @@ -1887,11 +1887,9 @@ int usb_gadget_probe_driver(struct usb_gadget_driver *driver, otg_set_vbus(musb->xceiv, 1); hcd->self.uses_pio_for_control = 1; - - if (musb->xceiv->last_event == USB_EVENT_NONE) - pm_runtime_put(musb->controller); - } + if (musb->xceiv->last_event == USB_EVENT_NONE) + pm_runtime_put(musb->controller); return 0; |