diff options
author | Huzaifa Sidhpurwala <huzaifas@redhat.com> | 2011-03-01 05:24:22 -0500 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2011-03-01 05:35:23 -0500 |
commit | c88ba39c1ea6a1591b6842199069ff50748d2073 (patch) | |
tree | affac446cabe2ff46063ab0eec1c754a8d166a51 /drivers/usb/musb | |
parent | 70045c57f31f998a7206baa81167c7bc9f452cef (diff) |
usb: musb: tusb: Fix possible null pointer dereference in tusb6010_omap.c
tusb_dma was being dereferenced when it was nul
Signed-off-by: Huzaifa Sidhpurwala <huzaifas@redhat.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/musb')
-rw-r--r-- | drivers/usb/musb/tusb6010_omap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/musb/tusb6010_omap.c b/drivers/usb/musb/tusb6010_omap.c index c061a88f2b0f..99cb541e4ef0 100644 --- a/drivers/usb/musb/tusb6010_omap.c +++ b/drivers/usb/musb/tusb6010_omap.c | |||
@@ -680,7 +680,7 @@ dma_controller_create(struct musb *musb, void __iomem *base) | |||
680 | 680 | ||
681 | tusb_dma = kzalloc(sizeof(struct tusb_omap_dma), GFP_KERNEL); | 681 | tusb_dma = kzalloc(sizeof(struct tusb_omap_dma), GFP_KERNEL); |
682 | if (!tusb_dma) | 682 | if (!tusb_dma) |
683 | goto cleanup; | 683 | goto out; |
684 | 684 | ||
685 | tusb_dma->musb = musb; | 685 | tusb_dma->musb = musb; |
686 | tusb_dma->tbase = musb->ctrl_base; | 686 | tusb_dma->tbase = musb->ctrl_base; |
@@ -721,6 +721,6 @@ dma_controller_create(struct musb *musb, void __iomem *base) | |||
721 | 721 | ||
722 | cleanup: | 722 | cleanup: |
723 | dma_controller_destroy(&tusb_dma->controller); | 723 | dma_controller_destroy(&tusb_dma->controller); |
724 | 724 | out: | |
725 | return NULL; | 725 | return NULL; |
726 | } | 726 | } |