From: Grazvydas Ignotas <notasas@gmail.com>
Date: Sun, 17 Mar 2013 15:13:15 +0000 (+0200)
Subject: usb: musb: omap2430: do vbus disable only when needed
X-Git-Tag: sz_154~9
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=d04d63797682e2200e32d6e6b097d00a798a2df0

usb: musb: omap2430: do vbus disable only when needed

doing it while suspended will cause external abort on OMAP3,
but DM3730 seems to be ok, hmh..
---

diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index 81f05f3ce9c9..55c0b937ef35 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -264,10 +264,10 @@ static int musb_otg_notifications(struct notifier_block *nb,
 	case USB_EVENT_NONE:
 		dev_dbg(musb->controller, "VBUS Disconnect\n");
 
-		omap2430_musb_set_vbus(musb, 0);
-
 		if (is_otg_enabled(musb) || is_peripheral_enabled(musb))
 			if (musb->gadget_driver) {
+				omap2430_musb_set_vbus(musb, 0);
+
 				pm_runtime_mark_last_busy(musb->controller);
 				pm_runtime_put_autosuspend(musb->controller);
 			}