diff --git a/src/portable/synopsys/dwc2/dcd_dwc2.c b/src/portable/synopsys/dwc2/dcd_dwc2.c
index 4cf725bfe..fe67de8dc 100644
--- a/src/portable/synopsys/dwc2/dcd_dwc2.c
+++ b/src/portable/synopsys/dwc2/dcd_dwc2.c
@@ -856,7 +856,7 @@ static void handle_epin_irq(uint8_t rhport) {
 
         // Process every single packet (only whole packets can be written to fifo)
         for (uint16_t i = 0; i < remain_packets; i++) {
-          const uint16_t remain_bytes = epin->dieptsiz_bm.xfer_size;
+          const uint16_t remain_bytes = (uint16_t) epin->dieptsiz_bm.xfer_size;
 
           // Packet can not be larger than ep max size
           const uint16_t xact_bytes = tu_min16(remain_bytes, xfer->max_size);
diff --git a/src/portable/synopsys/dwc2/hcd_dwc2.c b/src/portable/synopsys/dwc2/hcd_dwc2.c
index aabe1c062..f9fc5ca8e 100644
--- a/src/portable/synopsys/dwc2/hcd_dwc2.c
+++ b/src/portable/synopsys/dwc2/hcd_dwc2.c
@@ -742,7 +742,6 @@ static void handle_rxflvl_irq(uint8_t rhport) {
   // Pop control word off FIFO
   const dwc2_grxstsp_t grxstsp_bm = dwc2->grxstsp_bm;
   const uint8_t ch_id = grxstsp_bm.ep_ch_num;
-  // dwc2_channel_t* channel = &dwc2->channel[ch_id];
 
   switch (grxstsp_bm.packet_status) {
     case GRXSTS_PKTSTS_RX_DATA: {