From f007c7f4efb27c199d3a18fb9c4c7cb9d2e13415 Mon Sep 17 00:00:00 2001
From: Ajay Kumar Gupta <ajay.gupta@ti.com>
Date: Sat, 24 Jan 2009 17:56:39 -0800
Subject: [PATCH] --- yaml --- r: 130309 b: refs/heads/master c:
 97a39896816489fe9a67c223e782e8dda06f25c9 h: refs/heads/master i:   130307:
 71d23f63337019c27a44f5d8daea6370546972be 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 20e46b154eb9..122e33440582 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37daa925cf0d4dfd2d1d9ca01e2e0d74fba3d64a
+refs/heads/master: 97a39896816489fe9a67c223e782e8dda06f25c9
diff --git a/trunk/drivers/usb/musb/musb_core.c b/trunk/drivers/usb/musb/musb_core.c
index 6c7faacfb535..2cc34fa05b73 100644
--- a/trunk/drivers/usb/musb/musb_core.c
+++ b/trunk/drivers/usb/musb/musb_core.c
@@ -1824,8 +1824,9 @@ static void musb_free(struct musb *musb)
 	musb_gadget_cleanup(musb);
 #endif
 
-	if (musb->nIrq >= 0 && musb->irq_wake) {
-		disable_irq_wake(musb->nIrq);
+	if (musb->nIrq >= 0) {
+		if (musb->irq_wake)
+			disable_irq_wake(musb->nIrq);
 		free_irq(musb->nIrq, musb);
 	}
 	if (is_dma_capable() && musb->dma_controller) {