evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

usb: musb: omap: remove the check before calling otg_set_vbus

Browse source 
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>
This commit is contained in:
Kishon Vijay Abraham I 2013-03-14 11:53:56 +05:30 • committed by Felipe Balbi
parent a5eaaa1f33
commit bb467cf569
1 changed files with 4 additions and 6 deletions

10
drivers/usb/musb/omap2430.c
View file

@ -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 { } else {
musb->is_active = 1; musb->is_active = 1;
otg->default_a = 1; otg->default_a = 1;
@ -296,10 +295,9 @@ static void omap_musb_set_mailbox(struct omap2430_glue *glue)
pm_runtime_put_autosuspend(dev); pm_runtime_put_autosuspend(dev);
} }
if (data->interface_type == MUSB_INTERFACE_UTMI) { if (data->interface_type == MUSB_INTERFACE_UTMI)
if (musb->xceiv->otg->set_vbus) otg_set_vbus(musb->xceiv->otg, 0);
otg_set_vbus(musb->xceiv->otg, 0);
}
omap_control_usb_set_mode(glue->control_otghs, omap_control_usb_set_mode(glue->control_otghs,
USB_MODE_DISCONNECT); USB_MODE_DISCONNECT);
break; break;