]> 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)
committerAK <andi@firstfloor.org>
Thu, 31 Mar 2011 18:58:14 +0000 (11:58 -0700)
commit0fa2aea484fd2fd9a713c77445a1bc49eafd3ad7
treec68b0fae48b70c7501925fb0b00bfd50b13f01e4
parent3f2e65401564db89de1c91901287b483f38db5c6
xhci: Fix an error in count_sg_trbs_needed()

commit bcd2fde05341cef0052e49566ec88b406a521cf3 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
drivers/usb/host/xhci-ring.c