Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58719487 authored by Xenia Ragiadakou's avatar Xenia Ragiadakou Committed by Sarah Sharp
Browse files

xhci: convert TRB_CYCLE to le32 before using it to set Link TRB's cycle bit 



This patch converts TRB_CYCLE to le32 to update correctly the Cycle Bit in
'control' field of the link TRB.
This bug was found using sparse.

Signed-off-by: default avatarXenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
parent 6ce4eac1

drivers/usb/host/xhci-mem.c

+3 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static struct xhci_segment *xhci_segment_alloc(struct xhci_hcd *xhci, 
	/* If the cycle state is 0, set the cycle bit to 1 for all the TRBs */

	if (cycle_state == 0) {

		for (i = 0; i < TRBS_PER_SEGMENT; i++)

			seg->trbs[i].link.control |= TRB_CYCLE;

			seg->trbs[i].link.control |= cpu_to_le32(TRB_CYCLE);

	}

	seg->dma = dma;

	seg->next = NULL;
@@ -308,7 +308,8 @@ static void xhci_reinit_cached_ring(struct xhci_hcd *xhci, 
				sizeof(union xhci_trb)*TRBS_PER_SEGMENT);

		if (cycle_state == 0) {

			for (i = 0; i < TRBS_PER_SEGMENT; i++)

				seg->trbs[i].link.control |= TRB_CYCLE;

				seg->trbs[i].link.control |=

					cpu_to_le32(TRB_CYCLE);

		}

		/* All endpoint rings have link TRBs */

		xhci_link_segments(xhci, seg, seg->next, type);