From f82b5310882625d64a0973014abf6040a85c8b07 Mon Sep 17 00:00:00 2001 From: Avichal Rakesh Date: Tue, 30 May 2023 14:05:13 -0700 Subject: [PATCH] Revert "FROMGIT: usb: gadget: udc: core: Prevent redundant calls to pullup" This reverts commit b9bb33b73cbab1431ef5de4e76198e2d19d20910. Reason: This patch breaks any USB gadget function that deactivates the gadget on bind (by setting bind_deactivated = true). Bug: 285019584 Signed-off-by: Avichal Rakesh (cherry picked from https://android-review.googlesource.com/q/commit:b59c3ebaf21e40182bad5160dd5d721d8c849f59) Merged-In: I2885819dd75e9d65de8258b7d2f6fc5d98de6c68 Change-Id: I2885819dd75e9d65de8258b7d2f6fc5d98de6c68 --- drivers/usb/gadget/udc/core.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c index 4989efc99e12..02dfe8ffde98 100644 --- a/drivers/usb/gadget/udc/core.c +++ b/drivers/usb/gadget/udc/core.c @@ -673,9 +673,6 @@ static int usb_gadget_connect_locked(struct usb_gadget *gadget) goto out; } - if (gadget->connected) - goto out; - if (gadget->deactivated || !gadget->udc->started) { /* * If gadget is deactivated we only save new state.