---

yaml
---
r: 364735
b: refs/heads/master
c: bb467cf
h: refs/heads/master
i:
  364733: 78d5b15
  364731: 19ed9cf
  364727: 83456de
  364719: d6525ab
  364703: cd0b2b1
  364671: fca8e84
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5eaaa1f33e771fa1651a4a7652b8a5f9fa7f6c1
+refs/heads/master: bb467cf5693b59c76c22b73dd383920a87f37b16

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;