From 587906505362f72dc78601fd96d5c74c9e64d078 Mon Sep 17 00:00:00 2001
From: Johan Hovold <jhovold@gmail.com>
Date: Fri, 11 Feb 2011 16:57:08 +0100
Subject: [PATCH] --- yaml --- r: 233569 b: refs/heads/master c:
 b193b412e62b134adf69af286c7e7f8e99259350 h: refs/heads/master i:   233567:
 498797e025fe002ece4a6385769f9619aa07334c v: v3

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

diff --git a/[refs] b/[refs]
index c0fef823c8d8..6bb66dc5b6af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5990378b393429244559f4750f2ee3a50929b932
+refs/heads/master: b193b412e62b134adf69af286c7e7f8e99259350
diff --git a/trunk/drivers/usb/musb/omap2430.c b/trunk/drivers/usb/musb/omap2430.c
index a3f12333fc41..bc8badd16897 100644
--- a/trunk/drivers/usb/musb/omap2430.c
+++ b/trunk/drivers/usb/musb/omap2430.c
@@ -362,6 +362,7 @@ static int omap2430_musb_init(struct musb *musb)
 
 static int omap2430_musb_exit(struct musb *musb)
 {
+	del_timer_sync(&musb_idle_timer);
 
 	omap2430_low_level_exit(musb);
 	otg_put_transceiver(musb->xceiv);