| commit | 52d38a02368bb821bb1df4a55f52f65d9a9f0b85 | |
| author | Paul Zimmerman <Paul.Zimmerman@synopsys.com> | |
| Sat, 12 Feb 2011 22:07:57 +0000 (12 14:07 -0800) | ||
| committer | Greg Kroah-Hartman <gregkh@suse.de> | |
| Mon, 21 Mar 2011 19:45:22 +0000 (21 12:45 -0700) | ||
| tree | 8f60a142d9fdf3c755770e497116ddbc1fe3355e | treesnapshot (tar.gz zip) |
| parent | f62d7814294e094f0d57805ff7e9d6406bdae058 | commitdiff |
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>
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>
| drivers/usb/host/xhci-ring.c | diffblobblamehistory |