2 files changed, 3 insertions, 16 deletions

diff --git a/drivers/usb/renesas_usbhs/fifo.c b/drivers/usb/renesas_usbhs/fifo.c
index b0c97a3f1bfe..0e079256e533 100644
--- a/drivers/usb/renesas_usbhs/fifo.c
+++ b/drivers/usb/renesas_usbhs/fifo.c
@@ -577,14 +577,6 @@ static int usbhsf_pio_try_push(struct usbhs_pkt *pkt, int *is_done)
                 usbhs_pipe_number(pipe),
                 pkt->length, pkt->actual, *is_done, pkt->zero);
 
-        /*
-         * Transmission end
-         */
-        if (*is_done) {
-                if (usbhs_pipe_is_dcp(pipe))
-                        usbhs_dcp_control_transfer_done(pipe);
-        }
-
         usbhsf_fifo_unselect(pipe, fifo);
 
         return 0;
@@ -722,14 +714,6 @@ usbhs_fifo_read_end:
                 usbhs_pipe_number(pipe),
                 pkt->length, pkt->actual, *is_done, pkt->zero);
 
-        /*
-         * Transmission end
-         */
-        if (*is_done) {
-                if (usbhs_pipe_is_dcp(pipe))
-                        usbhs_dcp_control_transfer_done(pipe);
-        }
-
 usbhs_fifo_read_busy:
         usbhsf_fifo_unselect(pipe, fifo);
 
diff --git a/drivers/usb/renesas_usbhs/mod_gadget.c b/drivers/usb/renesas_usbhs/mod_gadget.c
index cb2d529e3a33..2457306e0924 100644
--- a/drivers/usb/renesas_usbhs/mod_gadget.c
+++ b/drivers/usb/renesas_usbhs/mod_gadget.c
@@ -485,6 +485,9 @@ static int usbhsg_irq_ctrl_stage(struct usbhs_priv *priv,
         case NODATA_STATUS_STAGE:
                 pipe->handler = &usbhs_ctrl_stage_end_handler;
                 break;
+        case READ_STATUS_STAGE:
+        case WRITE_STATUS_STAGE:
+                usbhs_dcp_control_transfer_done(pipe);
         default:
                 return ret;
         }