From 67f8adc4f25beb7e9e5a45969042335c6832b09f Mon Sep 17 00:00:00 2001
From: Grazvydas Ignotas <notasas@gmail.com>
Date: Thu, 12 Jan 2012 15:22:45 +0200
Subject: [PATCH] --- yaml --- r: 287039 b: refs/heads/master c:
 24307caef4950e42e7875a901856ed8816c4679c h: refs/heads/master i:   287037:
 e51c79d43479816cc85193a3941e5a35121ef269   287035:
 4058e16c58ae8198955a814384362c785d6a7eee   287031:
 a4e4fa70af67088c807bd459fa6f23e98896eb58   287023:
 2dd4f837b0b3507c4485961fe4960fecc488e840   287007:
 393d73e3209aceef3aef14d10a75f9ec21a108b7   286975:
 59fd3f21db6605c0f2079734ef520795f2da3a3b v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/usb/musb/musb_core.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index db61cfcbc445..b84d9571ed89 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b5203f1883e2dd49273e9f91235c36a0708aad1
+refs/heads/master: 24307caef4950e42e7875a901856ed8816c4679c
diff --git a/trunk/drivers/usb/musb/musb_core.c b/trunk/drivers/usb/musb/musb_core.c
index 56cf0243979e..3d11cf64ebd1 100644
--- a/trunk/drivers/usb/musb/musb_core.c
+++ b/trunk/drivers/usb/musb/musb_core.c
@@ -981,6 +981,9 @@ static void musb_shutdown(struct platform_device *pdev)
 	unsigned long	flags;
 
 	pm_runtime_get_sync(musb->controller);
+
+	musb_gadget_cleanup(musb);
+
 	spin_lock_irqsave(&musb->lock, flags);
 	musb_platform_disable(musb);
 	musb_generic_disable(musb);
@@ -1827,8 +1830,6 @@ static void musb_free(struct musb *musb)
 	sysfs_remove_group(&musb->controller->kobj, &musb_attr_group);
 #endif
 
-	musb_gadget_cleanup(musb);
-
 	if (musb->nIrq >= 0) {
 		if (musb->irq_wake)
 			disable_irq_wake(musb->nIrq);