X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/f555ad7ced743a19eb1eefaf5eaf536fcbe58d80..d771b1ff8f721ed03fc044d232620a51cb6e473e:/LUFA/Drivers/USB/Class/Host/MassStorage.c

diff --git a/LUFA/Drivers/USB/Class/Host/MassStorage.c b/LUFA/Drivers/USB/Class/Host/MassStorage.c
index e632827be..2b7d88ec8 100644
--- a/LUFA/Drivers/USB/Class/Host/MassStorage.c
+++ b/LUFA/Drivers/USB/Class/Host/MassStorage.c
@@ -29,7 +29,8 @@
 */
 
 #define  __INCLUDE_FROM_USB_DRIVER
-#include "../../HighLevel/USBMode.h"
+#include "../../Core/USBMode.h"
+
 #if defined(USB_CAN_BE_HOST)
 
 #define  __INCLUDE_FROM_MS_DRIVER
@@ -171,12 +172,12 @@ static uint8_t MS_Host_SendCommand(USB_ClassInfo_MS_Host_t* const MSInterfaceInf
 {
 	uint8_t ErrorCode = PIPE_RWSTREAM_NoError;
 
-	SCSICommandBlock->Signature = MS_CBW_SIGNATURE;
-	SCSICommandBlock->Tag       = ++MSInterfaceInfo->State.TransactionTag;
-
-	if (MSInterfaceInfo->State.TransactionTag == 0xFFFFFFFF)
+	if (++MSInterfaceInfo->State.TransactionTag == 0xFFFFFFFF)
 	  MSInterfaceInfo->State.TransactionTag = 1;
 
+	SCSICommandBlock->Signature = MS_CBW_SIGNATURE;
+	SCSICommandBlock->Tag       = MSInterfaceInfo->State.TransactionTag;
+
 	Pipe_SelectPipe(MSInterfaceInfo->Config.DataOUTPipeNumber);
 	Pipe_Unfreeze();
 
@@ -360,7 +361,7 @@ uint8_t MS_Host_GetMaxLUN(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
 	if ((ErrorCode = USB_Host_SendControlRequest(MaxLUNIndex)) != HOST_SENDCONTROL_Successful)
 	{
 		*MaxLUNIndex = 0;
-		ErrorCode = HOST_SENDCONTROL_Successful;
+		ErrorCode    = HOST_SENDCONTROL_Successful;
 	}
 
 	return ErrorCode;