summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvichal Rakesh <arakesh@google.com>2023-05-30 14:05:13 -0700
committerWill Deacon <willdeacon@google.com>2023-06-01 08:09:04 +0000
commit3f1b62f98dd7a2725457c7c00b369bd357470f89 (patch)
tree02f77e535f6c7bddb75f1943a583df217397735a
parent4299d5b3e6b381c92b2176cb8c8602852f594278 (diff)
downloadcommon-android-gs-tangorpro-5.10-u-beta4.tar.gz
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 Bug: 285216548 Signed-off-by: Avichal Rakesh <arakesh@google.com> (cherry picked from https://android-review.googlesource.com/q/commit:b59c3ebaf21e40182bad5160dd5d721d8c849f59) Merged-In: I2885819dd75e9d65de8258b7d2f6fc5d98de6c68 Change-Id: I2885819dd75e9d65de8258b7d2f6fc5d98de6c68 (cherry picked from commit f82b5310882625d64a0973014abf6040a85c8b07)
-rw-r--r--drivers/usb/gadget/udc/core.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c
index 76afca85fd0b..ff7902cf4ed2 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.