Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb467cf5 authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Felipe Balbi
Browse files

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: default avatarKishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent a5eaaa1f

drivers/usb/musb/omap2430.c

+4 −6
Original line number Diff line number Diff line
@@ -174,7 +174,6 @@ static void omap2430_musb_set_vbus(struct musb *musb, int is_on) 
				}

			}



			if (otg->set_vbus)

			otg_set_vbus(otg, 1);

		} else {

			musb->is_active = 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)

		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;