diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-02-26 08:53:50 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-02-26 08:53:50 +0300 |
| commit | a560a5672826fc1e057068bda93b3d4c98d037a2 (patch) | |
| tree | 7bc3774f7ec5fa2346a86b7158f975b9a762697a /drivers/usb/dwc3 | |
| parent | e89fbb5bc21a10a0de2bb878d4df09f538dc523b (diff) | |
| parent | d206a76d7d2726f3b096037f2079ce0bd3ba329b (diff) | |
| download | linux-a560a5672826fc1e057068bda93b3d4c98d037a2.tar.xz | |
Merge v6.8-rc6 into usb-next
We need it here for the USB fixes, and it resolves a merge conflict as
reported in linux-next in drivers/usb/roles/class.c
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/dwc3')
| -rw-r--r-- | drivers/usb/dwc3/gadget.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index da0de9cc9fa3..40c52dbc28d3 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -2631,6 +2631,11 @@ static int dwc3_gadget_soft_disconnect(struct dwc3 *dwc) int ret; spin_lock_irqsave(&dwc->lock, flags); + if (!dwc->pullups_connected) { + spin_unlock_irqrestore(&dwc->lock, flags); + return 0; + } + dwc->connected = false; /* |