summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlav Kongas <ok@artecdesign.ee>2005-10-17 14:30:43 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-17 14:45:49 -0700
commite9b765decfb49ddc105d303d491e1bee9769436f (patch)
tree16fdd136b112a86c4313436e83a51549346db40c
parent2cc78eb52bc1ae89f0a4fa5a00eb998dffde4a9f (diff)
downloadlinux-3.10-e9b765decfb49ddc105d303d491e1bee9769436f.tar.gz
linux-3.10-e9b765decfb49ddc105d303d491e1bee9769436f.tar.bz2
linux-3.10-e9b765decfb49ddc105d303d491e1bee9769436f.zip
[PATCH] isp116x-hcd: fix handling of short transfers
Increased use of scatter-gather by usb-storage driver after 2.6.13 has exposed a buggy codepath in isp116x-hcd, which was probably never visited before: bug happened only for those urbs, for which URB_SHORT_NOT_OK was set AND short transfer occurred. The fix attached was tested in 2 ways: (a) it fixed failing initialization of a flash drive with an embedded hub; (b) the fix was tested with 'usbtest' against a modified g_zero driver (on top of net2280), which generated short bulk IN transfers of various lengths including multiples and non-multiples of max_packet_length. Signed-off-by: Olav Kongas <ok@artecdesign.ee> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/usb/host/isp116x-hcd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c
index 41bbae83fc7..e142056b0d2 100644
--- a/drivers/usb/host/isp116x-hcd.c
+++ b/drivers/usb/host/isp116x-hcd.c
@@ -326,7 +326,8 @@ static void postproc_atl_queue(struct isp116x *isp116x)
usb_settoggle(udev, ep->epnum,
ep->nextpid ==
USB_PID_OUT,
- PTD_GET_TOGGLE(ptd) ^ 1);
+ PTD_GET_TOGGLE(ptd));
+ urb->actual_length += PTD_GET_COUNT(ptd);
urb->status = cc_to_error[TD_DATAUNDERRUN];
spin_unlock(&urb->lock);
continue;