diff --git a/drivers/usb/usbport/usb2.c b/drivers/usb/usbport/usb2.c
index 1d609addaa7..9d7a6548bc1 100644
--- a/drivers/usb/usbport/usb2.c
+++ b/drivers/usb/usbport/usb2.c
@@ -644,7 +644,7 @@ USB2_MoveTtEndpoint(IN PUSB2_TT_ENDPOINT TtEndpoint,
     TransferType = TtEndpoint->TtEndpointParams.TransferType;
 
     if (Rebalance->RebalanceEndpoint[Num] &&
-        TtEndpoint->TtEndpointParams.EndpointMoved == TRUE &&
+        TtEndpoint->TtEndpointParams.EndpointMoved &&
         ((TransferType != USBPORT_TRANSFER_TYPE_INTERRUPT) || BusTime >= 0))
     {
         DPRINT("USB2_MoveTtEndpoint: result - FALSE\n");
@@ -668,7 +668,7 @@ USB2_MoveTtEndpoint(IN PUSB2_TT_ENDPOINT TtEndpoint,
         *OutResult = FALSE;
     }
 
-    TtEndpoint->TtEndpointParams.EndpointMoved = TRUE;
+    TtEndpoint->TtEndpointParams.EndpointMoved = 1;
 
     if (Rebalance->RebalanceEndpoint[Num] == NULL)
     {
diff --git a/drivers/usb/usbport/usbport.h b/drivers/usb/usbport/usbport.h
index 04936bfe304..02726fea48c 100644
--- a/drivers/usb/usbport/usbport.h
+++ b/drivers/usb/usbport/usbport.h
@@ -486,8 +486,8 @@ typedef union _USB2_TT_ENDPOINT_PARAMS {
   struct {
     ULONG TransferType           : 4;
     ULONG Direction              : 1;
-    USB_DEVICE_SPEED DeviceSpeed : 2;
-    BOOL EndpointMoved           : 1;
+    ULONG DeviceSpeed            : 2;
+    ULONG EndpointMoved          : 1;
     ULONG Reserved               : 24;
   };
   ULONG AsULONG;