diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-22 13:59:53 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-22 13:59:59 -0800 |
| commit | 6db174eaada4c2c426eca689ea871d9c0546f7a9 (patch) | |
| tree | 5cca48ecd33ac158bfb47ad44618e87060a78fe3 /drivers/usb/musb/musb_core.c | |
| parent | 06e298b46417bc729b996396a068daf462e2ab62 (diff) | |
| parent | b0945c07d9110a5b97a5495e26accdbe1d0d9277 (diff) | |
| download | talos-op-linux-6db174eaada4c2c426eca689ea871d9c0546f7a9.tar.gz talos-op-linux-6db174eaada4c2c426eca689ea871d9c0546f7a9.zip | |
Merge branch 'for-next/musb' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
* 'for-next/musb' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb:
usb: musb: remove extern qualifier from musb_debug.h header
usb: musb: cleanup kconfig
usb: musb: trivial Kconfig cleanups
musb: omap2430: avoid pm_runtime_disable()
usb: musb: remove a bit of indentation
usb: musb: trivial cleanup
usb: musb: fix pm_runtime mismatch
Diffstat (limited to 'drivers/usb/musb/musb_core.c')
| -rw-r--r-- | drivers/usb/musb/musb_core.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index de7405e6d7dc..f6ff7923048b 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -2012,8 +2012,6 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) if (status < 0) goto fail3; - pm_runtime_put(musb->controller); - status = musb_init_debugfs(musb); if (status < 0) goto fail4; |
