From: Roel Kluin <roel.kluin@gmail.com>
Date: Sat, 9 Jan 2010 20:57:44 +0000 (+0100)
Subject: USB: musb: don't dereference NULL tusb_dma in dma_controller_destroy()
X-Git-Tag: v2.6.34-rc1~215^2~104
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=94089d56e456d2814c379538919180957a254e4a;p=net-next-2.6.git

USB: musb: don't dereference NULL tusb_dma in dma_controller_destroy()

Test whether tusb_dma is not NULL before dereferencing

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Cc: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/usb/musb/tusb6010_omap.c b/drivers/usb/musb/tusb6010_omap.c
index e13c77052e5..1c868096bd6 100644
--- a/drivers/usb/musb/tusb6010_omap.c
+++ b/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);