From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 11 Jan 2021 07:11:26 +0000 (+0100)
Subject: Merge 5.11-rc3 into usb-next
X-Git-Tag: accepted/tizen/unified/20230118.172025~7877^2~182
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a66a7d48f34a253429999dcc7188f607cd7a206a;p=platform%2Fkernel%2Flinux-rpi.git

Merge 5.11-rc3 into usb-next

Resolves a merge issue in:
	drivers/usb/dwc3/gadget.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

a66a7d48f34a253429999dcc7188f607cd7a206a
diff --cc drivers/usb/dwc3/gadget.c
index 85736dd,ee44321..ff14e5b
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@@ -2212,7 -2148,8 +2215,9 @@@ static int dwc3_gadget_pullup(struct us
  			dwc->ev_buf->lpos = (dwc->ev_buf->lpos + count) %
  						dwc->ev_buf->length;
  		}
 +		dwc->connected = false;
+ 	} else {
+ 		__dwc3_gadget_start(dwc);
  	}
  
  	ret = dwc3_gadget_run_stop(dwc, is_on, false);