From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 26 Sep 2022 08:38:21 +0000 (+0200)
Subject: Merge 6.0-rc7 into usb-next
X-Git-Tag: v6.6.17~6449^2~33
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=67102bd31b4e31abb0abbc390381212a2d65db72;p=platform%2Fkernel%2Flinux-rpi.git

Merge 6.0-rc7 into usb-next

We need the USB fixes in here for other follow-on changes to be able to
be applied successfully.

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

67102bd31b4e31abb0abbc390381212a2d65db72
diff --cc drivers/usb/dwc3/core.c
index 554e005,d0237b3..c0051e2
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@@ -1775,17 -1752,9 +1775,11 @@@ static int dwc3_probe(struct platform_d
  
  	dwc3_get_properties(dwc);
  
- 	if (!dwc->sysdev_is_parent) {
- 		ret = dma_set_mask_and_coherent(dwc->sysdev, DMA_BIT_MASK(64));
- 		if (ret)
- 			return ret;
- 	}
- 
  	dwc->reset = devm_reset_control_array_get_optional_shared(dev);
 -	if (IS_ERR(dwc->reset))
 -		return PTR_ERR(dwc->reset);
 +	if (IS_ERR(dwc->reset)) {
 +		ret = PTR_ERR(dwc->reset);
 +		goto put_usb_psy;
 +	}
  
  	if (dev->of_node) {
  		/*