1 files changed, 6 insertions, 0 deletions

diff --git a/firmware/target/arm/as3525/usb-drv-as3525v2.c b/firmware/target/arm/as3525/usb-drv-as3525v2.c
index dc9e0b3949..165c0e4723 100644
--- a/firmware/target/arm/as3525/usb-drv-as3525v2.c
+++ b/firmware/target/arm/as3525/usb-drv-as3525v2.c
@@ -748,6 +748,9 @@ static int usb_drv_transfer(int ep, void *ptr, int len, bool dir_in, bool blocki
     logf("usb-drv: xfer EP%d, len=%d, dir_in=%d, blocking=%d", ep,
         len, dir_in, blocking);
 
+    /* mask the usb interrupt to avoid any race */
+    VIC_INT_EN_CLEAR = INTERRUPT_USB;
+    
     volatile unsigned long *epctl = dir_in ? &DIEPCTL(ep) : &DOEPCTL(ep);
     volatile unsigned long *eptsiz = dir_in ? &DIEPTSIZ(ep) : &DOEPTSIZ(ep);
     volatile unsigned long *epdma = dir_in ? &DIEPDMA(ep) : &DOEPDMA(ep);
@@ -789,6 +792,9 @@ static int usb_drv_transfer(int ep, void *ptr, int len, bool dir_in, bool blocki
 
     DEPCTL |= DEPCTL_epena | DEPCTL_cnak;
 
+    /* unmask the usb interrupt */
+    VIC_INT_ENABLE = INTERRUPT_USB;
+
     if(blocking)
     {
         wakeup_wait(&endpoint->complete, TIMEOUT_BLOCK);