From e75f2a7e08da721d4d0ddcdf8dbd609c59a9d6ff Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Wed, 19 Aug 2009 14:26:10 +0000 Subject: [PATCH] --- yaml --- r: 163463 b: refs/heads/master c: 0bb886d2a9c2d4e069ca364e36c52c7ae6d1ca8c h: refs/heads/master i: 163461: 6d133e4eb6d0abd3fb5eaff17e5f3af93140a598 163459: 7341287ea319a829dc548d4b49f02f38222953e4 163455: a7b4e46f1b079dfd9933a123c8ddfe4a2582926f v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/r8a66597-udc.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d82cd58ee9e0..44de79c5479e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef5ce3b69028ea32aa87e98c9a3802e7c9f824b6 +refs/heads/master: 0bb886d2a9c2d4e069ca364e36c52c7ae6d1ca8c diff --git a/trunk/drivers/usb/gadget/r8a66597-udc.c b/trunk/drivers/usb/gadget/r8a66597-udc.c index 956618400a7c..9ca867a85a05 100644 --- a/trunk/drivers/usb/gadget/r8a66597-udc.c +++ b/trunk/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);