git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keith...
[pandora-kernel.git]
/
drivers
/
usb
/
musb
/
omap2430.c
diff --git
a/drivers/usb/musb/omap2430.c
b/drivers/usb/musb/omap2430.c
index
25cb8b0
..
e9e60b6
100644
(file)
--- a/
drivers/usb/musb/omap2430.c
+++ b/
drivers/usb/musb/omap2430.c
@@
-259,9
+259,10
@@
static int musb_otg_notifications(struct notifier_block *nb,
case USB_EVENT_VBUS:
DBG(4, "VBUS Connect\n");
case USB_EVENT_VBUS:
DBG(4, "VBUS Connect\n");
+#ifdef CONFIG_USB_GADGET_MUSB_HDRC
if (musb->gadget_driver)
pm_runtime_get_sync(musb->controller);
if (musb->gadget_driver)
pm_runtime_get_sync(musb->controller);
-
+#endif
otg_init(musb->xceiv);
break;
otg_init(musb->xceiv);
break;
@@
-269,7
+270,7
@@
static int musb_otg_notifications(struct notifier_block *nb,
DBG(4, "VBUS Disconnect\n");
#ifdef CONFIG_USB_GADGET_MUSB_HDRC
DBG(4, "VBUS Disconnect\n");
#ifdef CONFIG_USB_GADGET_MUSB_HDRC
- if (is_otg_enabled(musb))
+ if (is_otg_enabled(musb)
|| is_peripheral_enabled(musb)
)
if (musb->gadget_driver)
#endif
{
if (musb->gadget_driver)
#endif
{