From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 5 Sep 2022 06:03:23 +0000 (+0200)
Subject: Merge 6.0-rc4 into usb-next
X-Git-Tag: v6.6.17~6449^2~86
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a956f91247da3fe71e4d5f7da1f6dd8bae7c3c21;p=platform%2Fkernel%2Flinux-rpi.git

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>
---

a956f91247da3fe71e4d5f7da1f6dd8bae7c3c21
diff --cc drivers/usb/dwc3/gadget.c
index d6c0cb7,eca945f..3a344ba
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@@ -2569,8 -2563,11 +2566,13 @@@ static int dwc3_gadget_pullup(struct us
  		return 0;
  	}
  
+ 	if (dwc->pullups_connected == is_on) {
+ 		pm_runtime_put(dwc->dev);
+ 		return 0;
+ 	}
+ 
 +	synchronize_irq(dwc->irq_gadget);
 +
  	if (!is_on) {
  		ret = dwc3_gadget_soft_disconnect(dwc);
  	} else {