From 5c0c40f028580830d25338df9d33355e305ea110 Mon Sep 17 00:00:00 2001 From: Tommy Webb Date: Tue, 21 Jan 2025 22:08:19 +0000 Subject: [PATCH] Revert "usb: dwc3: Handle charging behavior when usb data is disabled" This reverts commit f60138b6bcb37a6c535980ca2d76b2c2c9839605. Reason for revert: Conflicts with upstream changes. Change-Id: Ic376c5d1b2fe9e5ae961c1114375ffbc3ae781f3 --- drivers/usb/dwc3/dwc3-msm.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) 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;