From 5001e93593f78608805c84d76b92b9dd2ba83f0c Mon Sep 17 00:00:00 2001
From: Yunfan Zhang <yfzhang@marvell.com>
Date: Tue, 10 Jul 2012 10:07:06 +0800
Subject: [PATCH] --- yaml --- r: 325874 b: refs/heads/master c:
 1dcaa252fdf01e4ba49ece156812043baf01c7cc h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/usb/gadget/mv_udc_core.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 19c5119c6040..fb56c422ea22 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60326ce377090541db9ba1a05a041316ab5b46ec
+refs/heads/master: 1dcaa252fdf01e4ba49ece156812043baf01c7cc
diff --git a/trunk/drivers/usb/gadget/mv_udc_core.c b/trunk/drivers/usb/gadget/mv_udc_core.c
index ff6154d1816e..58edff9abcef 100644
--- a/trunk/drivers/usb/gadget/mv_udc_core.c
+++ b/trunk/drivers/usb/gadget/mv_udc_core.c
@@ -2501,9 +2501,11 @@ static void mv_udc_shutdown(struct platform_device *dev)
 	u32 mode;
 
 	/* reset controller mode to IDLE */
+	mv_udc_enable(udc);
 	mode = readl(&udc->op_regs->usbmode);
 	mode &= ~3;
 	writel(mode, &udc->op_regs->usbmode);
+	mv_udc_disable(udc);
 }
 
 static struct platform_driver udc_driver = {