When calculating the actual length for requests, we don't want to include the

8 byte request header. It was included in the case of outgoing request
transfers before. In fact we always just want the length of the data phase,
which for non-requests just happens to be the whole transfer.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26508 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/add-ons/kernel/busses/usb/ehci.cpp

@@ -1089,11 +1089,10 @@ EHCI::FinishTransfers()
 							transfer->data_descriptor,
 							vector, vectorCount,
 							&nextDataToggle);
-					} else {
+					} else if (transfer->data_descriptor) {
 						// calculate transfered length
 						actualLength = ReadActualLength(
-							(ehci_qtd *)transfer->queue_head->element_log,
+							transfer->data_descriptor, &nextDataToggle);
-							&nextDataToggle);
 					}
 
 					transfer->transfer->TransferPipe()->SetDataToggle(nextDataToggle);

src/add-ons/kernel/busses/usb/ohci.cpp

@@ -1029,10 +1029,10 @@ OHCI::_FinishTransfers()
 						actualLength = _ReadDescriptorChain(
 							transfer->data_descriptor,
 							vector, vectorCount);
-					} else {
+					} else if (transfer->data_descriptor) {
 						// read the actual length that was sent
 						actualLength = _ReadActualLength(
-							transfer->first_descriptor);
+							transfer->data_descriptor);
 					}
 
 					if (transfer->transfer->IsFragmented()) {

src/add-ons/kernel/busses/usb/uhci.cpp

@@ -1225,10 +1225,10 @@ UHCI::FinishTransfers()
 							transfer->data_descriptor,
 							vector, vectorCount,
 							&lastDataToggle);
-					} else {
+					} else if (transfer->data_descriptor) {
 						// read the actual length that was sent
 						actualLength = ReadActualLength(
-							transfer->first_descriptor, &lastDataToggle);
+							transfer->data_descriptor, &lastDataToggle);
 					}
 
 					transfer->transfer->TransferPipe()->SetDataToggle(lastDataToggle == 0);