aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/musb
diff options
context:
space:
mode:
authorKishon Vijay Abraham I <kishon@ti.com>2013-03-14 02:23:56 -0400
committerFelipe Balbi <balbi@ti.com>2013-03-18 05:18:25 -0400
commitbb467cf5693b59c76c22b73dd383920a87f37b16 (patch)
tree4585bb3fa25aef79f979ac74e3abaeab5279ad45 /drivers/usb/musb
parenta5eaaa1f33e771fa1651a4a7652b8a5f9fa7f6c1 (diff)
usb: musb: omap: remove the check before calling otg_set_vbus
No functional change. otg_set_vbus is already protected so removed the check before calling otg_set_vbus. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/musb')
-rw-r--r--drivers/usb/musb/omap2430.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index e7b5eae5a141..018373d1c2c4 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -174,8 +174,7 @@ static void omap2430_musb_set_vbus(struct musb *musb, int is_on)
174 } 174 }
175 } 175 }
176 176
177 if (otg->set_vbus) 177 otg_set_vbus(otg, 1);
178 otg_set_vbus(otg, 1);
179 } else { 178 } else {
180 musb->is_active = 1; 179 musb->is_active = 1;
181 otg->default_a = 1; 180 otg->default_a = 1;
@@ -296,10 +295,9 @@ static void omap_musb_set_mailbox(struct omap2430_glue *glue)
296 pm_runtime_put_autosuspend(dev); 295 pm_runtime_put_autosuspend(dev);
297 } 296 }
298 297
299 if (data->interface_type == MUSB_INTERFACE_UTMI) { 298 if (data->interface_type == MUSB_INTERFACE_UTMI)
300 if (musb->xceiv->otg->set_vbus) 299 otg_set_vbus(musb->xceiv->otg, 0);
301 otg_set_vbus(musb->xceiv->otg, 0); 300
302 }
303 omap_control_usb_set_mode(glue->control_otghs, 301 omap_control_usb_set_mode(glue->control_otghs,
304 USB_MODE_DISCONNECT); 302 USB_MODE_DISCONNECT);
305 break; 303 break;