diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-10-20 10:21:33 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-10-20 10:21:33 +0200 |
| commit | 312f5726055534be1dc9dd369be13aabd2943fcb (patch) | |
| tree | 29394a3f83b4952a73b36a4aa962dfeda839e9db /drivers/usb/host/isp116x-hcd.c | |
| parent | drm: fix drm PCIGART (diff) | |
| parent | Linux v2.6.14-rc5 (diff) | |
| download | linux-312f5726055534be1dc9dd369be13aabd2943fcb.tar.xz linux-312f5726055534be1dc9dd369be13aabd2943fcb.zip | |
merge Linus head tree into my drm tree and fix up conflicts
Diffstat (limited to 'drivers/usb/host/isp116x-hcd.c')
| -rw-r--r-- | drivers/usb/host/isp116x-hcd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c index 41bbae83fc71..e142056b0d2c 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; |