Skip to content

Commit

Permalink
usb: musb: omap: remove the check before calling otg_set_vbus
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kishon Vijay Abraham I authored and Felipe Balbi committed Mar 18, 2013
1 parent a5eaaa1 commit bb467cf
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions drivers/usb/musb/omap2430.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit bb467cf

Please sign in to comment.