Author: janderwald Date: Mon Feb 27 20:10:46 2012 New Revision: 55889
URL: http://svn.reactos.org/svn/reactos?rev=55889&view=rev Log: [USBSTOR] - Do not retry commands more than once - Enable error handling in the data completion stage
Modified: trunk/reactos/drivers/usb/usbstor/error.c trunk/reactos/drivers/usb/usbstor/scsi.c
Modified: trunk/reactos/drivers/usb/usbstor/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/error.c... ============================================================================== --- trunk/reactos/drivers/usb/usbstor/error.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/error.c [iso-8859-1] Mon Feb 27 20:10:46 2012 @@ -159,7 +159,7 @@ pCDB = (PCDB)Request->Cdb; ASSERT(pCDB);
- if (Status != STATUS_SUCCESS) + if (Status != STATUS_SUCCESS || Context->RetryCount >= 1) { // // Complete the master IRP
Modified: trunk/reactos/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/scsi.c?... ============================================================================== --- trunk/reactos/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/scsi.c [iso-8859-1] Mon Feb 27 20:10:46 2012 @@ -434,6 +434,7 @@ PVOID Ctx) { PIRP_CONTEXT Context; + NTSTATUS Status;
DPRINT("USBSTOR_DataCompletionRoutine Irp %p Ctx %p Status %x\n", Irp, Ctx, Irp->IoStatus.Status); @@ -443,7 +444,6 @@ // Context = (PIRP_CONTEXT)Ctx;
-#if 0 if (!NT_SUCCESS(Irp->IoStatus.Status)) { // @@ -454,7 +454,6 @@ ASSERT(Status == STATUS_MORE_PROCESSING_REQUIRED); return STATUS_MORE_PROCESSING_REQUIRED; } -#endif
// // send csw