[USBSTOR] Fix USBSTOR_SendCSWRequest().

Author: vgalnt

drivers/usb/usbstor/scsi.c

@@ -240,14 +240,30 @@ USBSTOR_CSWCompletionRoutine(
 
 NTSTATUS
 USBSTOR_SendCSWRequest(
-    PFDO_DEVICE_EXTENSION FDODeviceExtension,
-    PIRP Irp)
+    _In_ PFDO_DEVICE_EXTENSION FDODeviceExtension,
+    _In_ PIRP Irp)
 {
+    ULONG TransferBufferLength;
+    ULONG TransferFlags;
+
+    DPRINT("USBSTOR_SendCSWRequest: %p, %p\n", FDODeviceExtension, Irp);
+
+    if (FDODeviceExtension->InterfaceInformation->Pipes[FDODeviceExtension->BulkInPipeIndex].MaximumPacketSize == 0x200)
+    {
+        TransferBufferLength = 0x200;
+        TransferFlags = USBD_SHORT_TRANSFER_OK;
+    }
+    else
+    {
+        TransferBufferLength = sizeof(CSW);
+        TransferFlags = 0;
+    }
+
     return USBSTOR_IssueBulkOrInterruptRequest(FDODeviceExtension,
                                                Irp,
                                                FDODeviceExtension->InterfaceInformation->Pipes[FDODeviceExtension->BulkInPipeIndex].PipeHandle,
-                                               USBD_TRANSFER_DIRECTION_IN,
-                                               sizeof(CSW),
+                                               TransferFlags,
+                                               TransferBufferLength,
                                                &FDODeviceExtension->CurrentIrpContext.csw,
                                                NULL,
                                                USBSTOR_CSWCompletionRoutine);

drivers/usb/usbstor/usbstor.h

@@ -345,8 +345,8 @@ USBSTOR_HandleExecuteSCSI(
 
 NTSTATUS
 USBSTOR_SendCSWRequest(
-    PFDO_DEVICE_EXTENSION FDODeviceExtension,
-    PIRP Irp);
+    _In_ PFDO_DEVICE_EXTENSION FDODeviceExtension,
+    _In_ PIRP Irp);
 
 NTSTATUS
 NTAPI