diff --git a/drivers/usb/dwc3/dwc3-msm.c b/drivers/usb/dwc3/dwc3-msm.c index 79f3f9474137..83027a1fbfcf 100644 --- a/drivers/usb/dwc3/dwc3-msm.c +++ b/drivers/usb/dwc3/dwc3-msm.c @@ -4090,13 +4090,8 @@ static int dwc3_msm_vbus_notifier(struct notifier_block *nb, if (!edev || !mdwc) return NOTIFY_DONE; - if (!mdwc->usb_data_enabled) { - if (event) - dwc3_msm_gadget_vbus_draw(mdwc, 500); - else - dwc3_msm_gadget_vbus_draw(mdwc, 0); + if (!mdwc->usb_data_enabled) return NOTIFY_DONE; - } dwc = platform_get_drvdata(mdwc->dwc3); @@ -5839,8 +5834,7 @@ static void dwc3_otg_sm_work(struct work_struct *w) mdwc->drd_state = DRD_STATE_PERIPHERAL; work = true; } else { - if (mdwc->usb_data_enabled) - dwc3_msm_gadget_vbus_draw(mdwc, 0); + dwc3_msm_gadget_vbus_draw(mdwc, 0); dev_dbg(mdwc->dev, "Cable disconnected\n"); } break;