From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 3 May 2022 14:35:26 +0000 (+0200)
Subject: Merge 5.18-rc5 into usb-next
X-Git-Tag: v6.6.17~7346^2~62
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b9c92fb4aabb8d93b657d028f7c530d6c42cb630;p=platform%2Fkernel%2Flinux-rpi.git

Merge 5.18-rc5 into usb-next

We need the USB fixes in here, and this resolves a merge issue in
drivers/usb/dwc3/drd.c

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

b9c92fb4aabb8d93b657d028f7c530d6c42cb630
diff --cc drivers/usb/dwc3/drd.c
index f277beb,8cad9e7..039bf24
--- a/drivers/usb/dwc3/drd.c
+++ b/drivers/usb/dwc3/drd.c
@@@ -539,11 -585,14 +539,10 @@@ int dwc3_drd_init(struct dwc3 *dwc
  	int ret, irq;
  
  	if (ROLE_SWITCH &&
- 	    device_property_read_bool(dwc->dev, "usb-role-switch")) {
- 		ret = dwc3_setup_role_switch(dwc);
- 		if (ret < 0)
- 			return ret;
- 	} else if (dwc->edev) {
+ 	    device_property_read_bool(dwc->dev, "usb-role-switch"))
+ 		return dwc3_setup_role_switch(dwc);
+ 
 -	dwc->edev = dwc3_get_extcon(dwc);
 -	if (IS_ERR(dwc->edev))
 -		return PTR_ERR(dwc->edev);
 -
+ 	if (dwc->edev) {
  		dwc->edev_nb.notifier_call = dwc3_drd_notifier;
  		ret = extcon_register_notifier(dwc->edev, EXTCON_USB_HOST,
  					       &dwc->edev_nb);