From 498797e025fe002ece4a6385769f9619aa07334c 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: 233567 b: refs/heads/master c:
 19b9a83e214d3d3ac52a56daca5ea0d033ca47bc h: refs/heads/master i:   233565:
 c59bcabbd6dc1a282015b17f2805cdb7144f18a1   233563:
 26d719653d09d71b6c30d637ada9124098df44f4   233559:
 4b20132c48b7ab614982a72968e0a9dba5d6e421   233551:
 3c3441ad4ca1f1c0d3af979b1a97d25925bda5af   233535:
 678e63f57ca284d886eb4a2fc9e3bc7625f4e448 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 23404c37bf2e..b3d710774f16 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1dc5157c574e7249dc1cd072fde2e48b3011533
+refs/heads/master: 19b9a83e214d3d3ac52a56daca5ea0d033ca47bc
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);