Clear DOEPCTL_USBAEP instead of setting DOEPCTL = DOEPCTL_SNAK

1 files changed, 4 insertions, 6 deletions

diff --git a/src/portable/synopsys/dwc2/dcd_dwc2.c b/src/portable/synopsys/dwc2/dcd_dwc2.c
index fe0b2492c..7a1d7dcf6 100644
--- a/src/portable/synopsys/dwc2/dcd_dwc2.c
+++ b/src/portable/synopsys/dwc2/dcd_dwc2.c
@@ -347,10 +347,10 @@ static void edpt_disable(uint8_t rhport, uint8_t ep_addr, bool stall) {
   }
 }
 
-// Force ISO OUT EP into NAK before re-activating it with a changed MPS.
+// Clear stale active-endpoint state before re-activating ISO OUT with a changed MPS.
 static void edpt_iso_out_reset(uint8_t rhport, uint8_t epnum) {
   dwc2_dep_t* epout = &DWC2_REG(rhport)->epout[epnum];
-  epout->doepctl = DOEPCTL_SNAK;
+  epout->doepctl &= ~DOEPCTL_USBAEP;
 }
 
 // Since this function returns void, it is not possible to return a boolean success message
@@ -641,16 +641,14 @@ bool dcd_edpt_iso_activate(uint8_t rhport,  tusb_desc_endpoint_t const * p_endpo
   const uint8_t epnum = tu_edpt_number(ep_addr);
   const uint8_t dir = tu_edpt_dir(ep_addr);
 
+  edpt_disable(rhport, ep_addr, false);
+
   if (dir == TUSB_DIR_OUT) {
     const uint16_t new_mps = tu_edpt_packet_size(p_endpoint_desc);
     xfer_ctl_t* xfer = XFER_CTL_BASE(epnum, dir);
     if (xfer->max_size != 0 && xfer->max_size != new_mps) {
       edpt_iso_out_reset(rhport, epnum);
-    } else {
-      edpt_disable(rhport, ep_addr, false);
     }
-  } else {
-    edpt_disable(rhport, ep_addr, false);
   }
 
   edpt_activate(rhport, p_endpoint_desc);