From 6e38e0e13c143945a215ad7da99ed229e510e4d2 Mon Sep 17 00:00:00 2001 From: Johannes Anderwald Date: Sun, 19 Feb 2012 00:16:50 +0000 Subject: [PATCH] [USBEHCI] - Remove assertion which no longer holds - Delete old queue head after a new queue head has been sucessfully fetched svn path=/trunk/; revision=55691 --- reactos/drivers/usb/usbehci/usb_queue.cpp | 10 +++++----- reactos/drivers/usb/usbehci/usb_request.cpp | 6 ------ 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/reactos/drivers/usb/usbehci/usb_queue.cpp b/reactos/drivers/usb/usbehci/usb_queue.cpp index 3f1348b8844..4629d00151d 100644 --- a/reactos/drivers/usb/usbehci/usb_queue.cpp +++ b/reactos/drivers/usb/usbehci/usb_queue.cpp @@ -769,16 +769,16 @@ CUSBQueue::QueueHeadCleanup( // 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 // diff --git a/reactos/drivers/usb/usbehci/usb_request.cpp b/reactos/drivers/usb/usbehci/usb_request.cpp index dd5f00eef70..769409c8f10 100644 --- a/reactos/drivers/usb/usbehci/usb_request.cpp +++ b/reactos/drivers/usb/usbehci/usb_request.cpp @@ -732,7 +732,6 @@ CUSBRequest::InitDescriptor( *OutDescriptorLength = Length; } - NTSTATUS CUSBRequest::BuildTransferDescriptorChain( IN PQUEUE_HEAD QueueHead, @@ -1192,11 +1191,6 @@ CUSBRequest::BuildBulkTransferQueueHead( &m_EndpointDescriptor->DataToggle, &ChainDescriptorLength); - // - // FIXME: handle errors - // - //ASSERT(ChainDescriptorLength == m_TransferBufferLength); - // // move to next offset //