]> git.karo-electronics.de Git - karo-tx-linux.git/commit
xhci: Fix an error in count_sg_trbs_needed()
authorPaul Zimmerman <Paul.Zimmerman@synopsys.com>
Sat, 12 Feb 2011 22:07:57 +0000 (14:07 -0800)
committerSarah Sharp <sarah.a.sharp@linux.intel.com>
Sun, 20 Feb 2011 15:01:28 +0000 (07:01 -0800)
commitbcd2fde05341cef0052e49566ec88b406a521cf3
treee2d101797ba072dea57c465b47b2892e7e4a19a3
parent5807795bd4dececdf553719cc02869e633395787
xhci: Fix an error in count_sg_trbs_needed()

The expression

while (running_total < sg_dma_len(sg))

does not take into account that the remaining data length can be less
than sg_dma_len(sg). In that case, running_total can end up being
greater than the total data length, so an extra TRB is counted.
Changing the expression to

while (running_total < sg_dma_len(sg) && running_total < temp)

fixes that.

This patch should be queued for stable kernels back to 2.6.31.

Signed-off-by: Paul Zimmerman <paulz@synopsys.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: stable@kernel.org
drivers/usb/host/xhci-ring.c