From 8697e020f9b70433e109146852688e1a8c4bc37f Mon Sep 17 00:00:00 2001
From: Kishon Vijay Abraham I <kishon@ti.com>
Date: Thu, 14 Mar 2013 11:53:56 +0530
Subject: [PATCH] --- yaml --- r: 364735 b: refs/heads/master c:
 bb467cf5693b59c76c22b73dd383920a87f37b16 h: refs/heads/master i:   364733:
 78d5b15e9d2858b0df6485eee55c56d5876a65da   364731:
 19ed9cf1d4ee8645a34aa00c87fd98eb50ca30d6   364727:
 83456dedfc0d0813c702c0844c72294855bfd9e4   364719:
 d6525abc6381ee651c3cbb864912019c35d0ed6d   364703:
 cd0b2b167131cc1e510463da234e759febf546de   364671:
 fca8e84d636227fe9081d82ef4e977669fd04dae v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/usb/musb/omap2430.c | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 2fa2b9661cd0..fa5cb031244f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5eaaa1f33e771fa1651a4a7652b8a5f9fa7f6c1
+refs/heads/master: bb467cf5693b59c76c22b73dd383920a87f37b16
diff --git a/trunk/drivers/usb/musb/omap2430.c b/trunk/drivers/usb/musb/omap2430.c
index e7b5eae5a141..018373d1c2c4 100644
--- a/trunk/drivers/usb/musb/omap2430.c
+++ b/trunk/drivers/usb/musb/omap2430.c
@@ -174,8 +174,7 @@ static void omap2430_musb_set_vbus(struct musb *musb, int is_on)
 				}
 			}
 
-			if (otg->set_vbus)
-				otg_set_vbus(otg, 1);
+			otg_set_vbus(otg, 1);
 		} else {
 			musb->is_active = 1;
 			otg->default_a = 1;
@@ -296,10 +295,9 @@ static void omap_musb_set_mailbox(struct omap2430_glue *glue)
 			pm_runtime_put_autosuspend(dev);
 		}
 
-		if (data->interface_type == MUSB_INTERFACE_UTMI) {
-			if (musb->xceiv->otg->set_vbus)
-				otg_set_vbus(musb->xceiv->otg, 0);
-		}
+		if (data->interface_type == MUSB_INTERFACE_UTMI)
+			otg_set_vbus(musb->xceiv->otg, 0);
+
 		omap_control_usb_set_mode(glue->control_otghs,
 			USB_MODE_DISCONNECT);
 		break;