[ros-diffs] [janderwald] 55691: [USBEHCI] - Remove assertion which no longer holds - Delete old queue head after a new queue head has been sucessfully fetched

Author: janderwald
Date: Sun Feb 19 00:16:50 2012
New Revision: 55691

URL: http://svn.reactos.org/svn/reactos?rev=55691&view=rev
Log:
[USBEHCI]
- Remove assertion which no longer holds
- Delete old queue head after a new queue head has been sucessfully fetched

Modified:
    trunk/reactos/drivers/usb/usbehci/usb_queue.cpp
    trunk/reactos/drivers/usb/usbehci/usb_request.cpp

Modified: trunk/reactos/drivers/usb/usbehci/usb_queue.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usb_que...
==============================================================================
--- trunk/reactos/drivers/usb/usbehci/usb_queue.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbehci/usb_queue.cpp [iso-8859-1] Sun Feb 19 00:16:50 2012
@@ -770,15 +770,15 @@
     if ((Request->IsRequestComplete() == FALSE) && (UrbStatus == USBD_STATUS_SUCCESS))
     {
         //
-        // let IUSBRequest free the queue head
-        //
-        Request->FreeQueueHead(CurrentQH);
-
-        //
         // request is incomplete, get new queue head
         //
         if (Request->GetQueueHead(&NewQueueHead) == STATUS_SUCCESS)
         {
+            //
+            // let IUSBRequest free the queue head
+            //
+            Request->FreeQueueHead(CurrentQH);
+
             //
             // first acquire request lock
             //

Modified: trunk/reactos/drivers/usb/usbehci/usb_request.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usb_req...
==============================================================================
--- trunk/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] Sun Feb 19 00:16:50 2012
@@ -731,7 +731,6 @@
     //
     *OutDescriptorLength = Length;
 }
-

NTSTATUS
 CUSBRequest::BuildTransferDescriptorChain(
@@ -1193,11 +1192,6 @@
                                           &ChainDescriptorLength);

//
-    // FIXME: handle errors
-    //
-    //ASSERT(ChainDescriptorLength == m_TransferBufferLength);
-
-    //
     // move to next offset
     //
     m_TransferBufferLengthCompleted += ChainDescriptorLength;