X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=drivers%2Fusb%2Fusbstor%2Fscsi.c;h=002b8f297688b7ef758ea5d0415ab30605484085;hp=05ef1c925c886272d23e22d83d2bf658582c86b4;hb=aaa90f698680fb51d27dc870fbe214ffd982bcde;hpb=c7ed299aaa35d746ac1677144341150d5e79e373 diff --git a/drivers/usb/usbstor/scsi.c b/drivers/usb/usbstor/scsi.c index 05ef1c925c8..002b8f29768 100644 --- a/drivers/usb/usbstor/scsi.c +++ b/drivers/usb/usbstor/scsi.c @@ -183,9 +183,9 @@ USBSTOR_CSWCompletionRoutine( { if (USBD_STATUS(Context->Urb.UrbHeader.Status) == USBD_STATUS(USBD_STATUS_STALL_PID)) { - if (Context->RetryCount < 2) + if (Context->StallRetryCount < 2) { - ++Context->RetryCount; + ++Context->StallRetryCount; // clear stall and resend cbw Context->ErrorIndex = 1; @@ -345,7 +345,7 @@ USBSTOR_DataCompletionRoutine( } else if (USBD_STATUS(Context->Urb.UrbHeader.Status) == USBD_STATUS(USBD_STATUS_STALL_PID)) { - ++Context->RetryCount; + ++Context->StallRetryCount; Request->SrbStatus = SRB_STATUS_DATA_OVERRUN; Request->DataTransferLength = Context->Urb.UrbBulkOrInterruptTransfer.TransferBufferLength; @@ -527,7 +527,7 @@ USBSTOR_SendCBWRequest( // initialize rest of context Context->Irp = Irp; Context->FDODeviceExtension = FDODeviceExtension; - Context->RetryCount = 0; + Context->StallRetryCount = 0; return USBSTOR_IssueBulkOrInterruptRequest( FDODeviceExtension, @@ -586,8 +586,7 @@ USBSTOR_IssueRequestSense( NTSTATUS USBSTOR_HandleExecuteSCSI( IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN ULONG RetryCount) + IN PIRP Irp) { PCDB pCDB; NTSTATUS Status;