From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 19 Jan 2026 09:24:11 +0000 (+0100)
Subject: Merge 6.19-rc6 usb-next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ac87cd859eca21ebf657d94affd29f40003bede;p=thirdparty%2Flinux.git

Merge 6.19-rc6 usb-next

We need the USB fixes in here as well.

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

5ac87cd859eca21ebf657d94affd29f40003bede
diff --cc drivers/usb/dwc3/core.c
index 670a9d4bfff24,93fd5fdf95cb1..f32b67bf73a45
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@@ -991,8 -991,10 +991,10 @@@ static bool dwc3_core_is_valid(struct d
  {
  	u32 reg;
  
 -	reg = dwc3_readl(dwc->regs, DWC3_GSNPSID);
 +	reg = dwc3_readl(dwc, DWC3_GSNPSID);
  	dwc->ip = DWC3_GSNPS_ID(reg);
+ 	if (dwc->ip == DWC4_IP)
+ 		dwc->ip = DWC32_IP;
  
  	/* This should read as U3 followed by revision number */
  	if (DWC3_IP_IS(DWC3)) {