1 files changed, 9 insertions, 0 deletions

diff --git a/drivers/usb/gadget/r8a66597-udc.c b/drivers/usb/gadget/r8a66597-udc.c
index 956618400a7c..9ca867a85a05 100644
--- a/drivers/usb/gadget/r8a66597-udc.c
+++ b/drivers/usb/gadget/r8a66597-udc.c
@@ -614,8 +614,17 @@ static void disable_controller(struct r8a66597 *r8a66597)
         if (r8a66597->pdata->on_chip) {
                 r8a66597_bset(r8a66597, SCKE, SYSCFG0);
 
+                /* disable interrupts */
                 r8a66597_write(r8a66597, 0, INTENB0);
                 r8a66597_write(r8a66597, 0, INTENB1);
+                r8a66597_write(r8a66597, 0, BRDYENB);
+                r8a66597_write(r8a66597, 0, BEMPENB);
+                r8a66597_write(r8a66597, 0, NRDYENB);
+
+                /* clear status */
+                r8a66597_write(r8a66597, 0, BRDYSTS);
+                r8a66597_write(r8a66597, 0, NRDYSTS);
+                r8a66597_write(r8a66597, 0, BEMPSTS);
 
                 r8a66597_bclr(r8a66597, USBE, SYSCFG0);
                 r8a66597_bclr(r8a66597, SCKE, SYSCFG0);