From 06010a14892dde1bc4609b609ff260e50bab4686 Mon Sep 17 00:00:00 2001
From: Roel Kluin <roel.kluin@gmail.com>
Date: Sat, 9 Jan 2010 21:57:44 +0100
Subject: [PATCH] --- yaml --- r: 185326 b: refs/heads/master c:
 94089d56e456d2814c379538919180957a254e4a h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index b2087676875b..926e070243a1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7410ced7f931bb1ad79d1336412cf7b7a33cb14
+refs/heads/master: 94089d56e456d2814c379538919180957a254e4a
diff --git a/trunk/drivers/usb/musb/tusb6010_omap.c b/trunk/drivers/usb/musb/tusb6010_omap.c
index e13c77052e5e..1c868096bd6f 100644
--- a/trunk/drivers/usb/musb/tusb6010_omap.c
+++ b/trunk/drivers/usb/musb/tusb6010_omap.c
@@ -648,7 +648,7 @@ void dma_controller_destroy(struct dma_controller *c)
 		}
 	}
 
-	if (!tusb_dma->multichannel && tusb_dma && tusb_dma->ch >= 0)
+	if (tusb_dma && !tusb_dma->multichannel && tusb_dma->ch >= 0)
 		omap_free_dma(tusb_dma->ch);
 
 	kfree(tusb_dma);