Skip to content

Commit b9252f8

Browse files
Epicuriusgregkh
authored andcommitted
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: fe688e5 ("usb: xhci: refactor xhci_link_rings() to use source and destination rings") Reported-by: Jeff Chua <[email protected]> Closes: https://lore.kernel.org/lkml/CAAJw_ZtppNqC9XA=-WVQDr+vaAS=di7jo15CzSqONeX48H75MA@mail.gmail.com/ Signed-off-by: Niklas Neronin <[email protected]> Signed-off-by: Mathias Nyman <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent e21ebe5 commit b9252f8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/usb/host/xhci-mem.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ int xhci_ring_expansion(struct xhci_hcd *xhci, struct xhci_ring *ring,
436436
goto free_segments;
437437
}
438438

439-
xhci_link_rings(xhci, ring, &new_ring);
439+
xhci_link_rings(xhci, &new_ring, ring);
440440
trace_xhci_ring_expansion(ring);
441441
xhci_dbg_trace(xhci, trace_xhci_dbg_ring_expansion,
442442
"ring expansion succeed, now has %d segments",

0 commit comments

Comments
 (0)