[USBSTOR]

- Do not retry commands more than once
- Enable error handling in the data completion stage

svn path=/trunk/; revision=55889
This commit is contained in:
Johannes Anderwald 2012-02-27 20:10:46 +00:00
parent f051482d69
commit 1efde9717f
2 changed files with 2 additions and 3 deletions

View file

@ -159,7 +159,7 @@ USBSTOR_HandleTransferError(
pCDB = (PCDB)Request->Cdb; pCDB = (PCDB)Request->Cdb;
ASSERT(pCDB); ASSERT(pCDB);
if (Status != STATUS_SUCCESS) if (Status != STATUS_SUCCESS || Context->RetryCount >= 1)
{ {
// //
// Complete the master IRP // Complete the master IRP

View file

@ -434,6 +434,7 @@ USBSTOR_DataCompletionRoutine(
PVOID Ctx) PVOID Ctx)
{ {
PIRP_CONTEXT Context; PIRP_CONTEXT Context;
NTSTATUS Status;
DPRINT("USBSTOR_DataCompletionRoutine Irp %p Ctx %p Status %x\n", Irp, Ctx, Irp->IoStatus.Status); DPRINT("USBSTOR_DataCompletionRoutine Irp %p Ctx %p Status %x\n", Irp, Ctx, Irp->IoStatus.Status);
@ -443,7 +444,6 @@ USBSTOR_DataCompletionRoutine(
// //
Context = (PIRP_CONTEXT)Ctx; Context = (PIRP_CONTEXT)Ctx;
#if 0
if (!NT_SUCCESS(Irp->IoStatus.Status)) if (!NT_SUCCESS(Irp->IoStatus.Status))
{ {
// //
@ -454,7 +454,6 @@ USBSTOR_DataCompletionRoutine(
ASSERT(Status == STATUS_MORE_PROCESSING_REQUIRED); ASSERT(Status == STATUS_MORE_PROCESSING_REQUIRED);
return STATUS_MORE_PROCESSING_REQUIRED; return STATUS_MORE_PROCESSING_REQUIRED;
} }
#endif
// //
// send csw // send csw