diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-09-05 08:03:23 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-09-05 08:03:23 +0200 |
commit | a956f91247da3fe71e4d5f7da1f6dd8bae7c3c21 (patch) | |
tree | dcbfa79369938f1349af5b39a68dee698861a815 /drivers/usb/dwc3/gadget.c | |
parent | USB: hcd-pci: Drop the unused id parameter from usb_hcd_pci_probe() (diff) | |
parent | Linux 6.0-rc4 (diff) | |
download | linux-dev-a956f91247da3fe71e4d5f7da1f6dd8bae7c3c21.tar.xz linux-dev-a956f91247da3fe71e4d5f7da1f6dd8bae7c3c21.zip |
Merge 6.0-rc4 into usb-next
We need the USB fixes in here and this resolves the merge issue in:
drivers/usb/dwc3/gadget.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/gadget.c')
-rw-r--r-- | drivers/usb/dwc3/gadget.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index d6c0cb79ace3..3a344ba0b292 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -2542,9 +2542,6 @@ static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on) is_on = !!is_on; - if (dwc->pullups_connected == is_on) - return 0; - dwc->softconnect = is_on; /* @@ -2569,6 +2566,11 @@ static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on) return 0; } + if (dwc->pullups_connected == is_on) { + pm_runtime_put(dwc->dev); + return 0; + } + synchronize_irq(dwc->irq_gadget); if (!is_on) { |