1
0

Merge 4.2-rc6 into usb-next

We want the USB fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Este cometimento está contido em:
Greg Kroah-Hartman
2015-08-10 10:01:33 -07:00
ascendente 7e34d70a71 f7644cbfcd
cometimento e6bbe1d053
459 ficheiros modificados com 6101 adições e 2708 eliminações

Ver ficheiro

@@ -82,7 +82,7 @@ dma_addr_t xhci_trb_virt_to_dma(struct xhci_segment *seg,
return 0;
/* offset in TRBs */
segment_offset = trb - seg->trbs;
if (segment_offset > TRBS_PER_SEGMENT)
if (segment_offset >= TRBS_PER_SEGMENT)
return 0;
return seg->dma + (segment_offset * sizeof(*trb));
}