Applied to for-usb-next for 3.14.
Thanks,
Sarah Sharp
On Mon, Sep 09, 2013 at 09:03:09PM +0300, Xenia Ragiadakou wrote:
> 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: Xenia Ragiadakou <burzalod...@gmail.com>
> ---
> drivers/usb/host/xhci-mem.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
> index f201990..37ae98f 100644
> --- a/drivers/usb/host/xhci-mem.c
> +++ b/drivers/usb/host/xhci-mem.c
> @@ -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);
> --
> 1.8.3.4
>
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
