Commit b9252f80 authored by Niklas Neronin's avatar Niklas Neronin Committed by Greg Kroah-Hartman
Browse files

usb: xhci: fix ring expansion regression in 6.13-rc1 



The source and destination rings were incorrectly assigned during the ring
linking process. The "source" ring, which contains the new segments,
was not spliced into the "destination" ring, leading to incorrect ring
expansion.

Fixes: fe688e50 ("usb: xhci: refactor xhci_link_rings() to use source and destination rings")
Reported-by: default avatarJeff Chua <jeff.chua.linux@gmail.com>
Closes: https://lore.kernel.org/lkml/CAAJw_ZtppNqC9XA=-WVQDr+vaAS=di7jo15CzSqONeX48H75MA@mail.gmail.com/


Signed-off-by: default avatarNiklas Neronin <niklas.neronin@linux.intel.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20241217102122.2316814-3-mathias.nyman@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e21ebe51

drivers/usb/host/xhci-mem.c

+1 −1
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ int xhci_ring_expansion(struct xhci_hcd *xhci, struct xhci_ring *ring, 
			goto free_segments;

	}



	xhci_link_rings(xhci, ring, &new_ring);

	xhci_link_rings(xhci, &new_ring, ring);

	trace_xhci_ring_expansion(ring);

	xhci_dbg_trace(xhci, trace_xhci_dbg_ring_expansion,

			"ring expansion succeed, now has %d segments",