diff --git a/[refs] b/[refs]
index f5b7c6cbc6e3..29b87f9e5756 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 366162245e619d59c9d615774ab3aa639deb7725
+refs/heads/master: 046b07ac0458fba8c5ca8d9ee04658c02066ee03
diff --git a/trunk/drivers/usb/gadget/mv_udc_core.c b/trunk/drivers/usb/gadget/mv_udc_core.c
index f8dc5b3dd796..ffa6f3097a64 100644
--- a/trunk/drivers/usb/gadget/mv_udc_core.c
+++ b/trunk/drivers/usb/gadget/mv_udc_core.c
@@ -2206,9 +2206,21 @@ static const struct dev_pm_ops mv_udc_pm_ops = {
 };
 #endif
 
+static void mv_udc_shutdown(struct platform_device *dev)
+{
+	struct mv_udc *udc = the_controller;
+	u32 mode;
+
+	/* reset controller mode to IDLE */
+	mode = readl(&udc->op_regs->usbmode);
+	mode &= ~3;
+	writel(mode, &udc->op_regs->usbmode);
+}
+
 static struct platform_driver udc_driver = {
 	.probe		= mv_udc_probe,
 	.remove		= __exit_p(mv_udc_remove),
+	.shutdown	= mv_udc_shutdown,
 	.driver		= {
 		.owner	= THIS_MODULE,
 		.name	= "pxa-u2o",