]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
USB: musb: don't dereference NULL tusb_dma in dma_controller_destroy()
authorRoel Kluin <roel.kluin@gmail.com>
Sat, 9 Jan 2010 20:57:44 +0000 (21:57 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 2 Mar 2010 22:54:14 +0000 (14:54 -0800)
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>
drivers/usb/musb/tusb6010_omap.c

index e13c77052e5e966a4f3dd45cc827f55289c12d92..1c868096bd6fb2697adff17fe018d5ec4400b11a 100644 (file)
@@ -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);