Messages in this thread Patch in this message | | | From | Fabio Baltieri <> | Subject | [PATCH 1/5] usb: musb: ux500_dma: add missing MEM resource check | Date | Thu, 28 Feb 2013 11:38:50 +0100 |
| |
From: Virupax Sadashivpetimath <virupax.sadashivpetimath@stericsson.com>
Fix dma_controller_create() fail path in case memory resource is missing.
Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Virupax Sadashivpetimath <virupax.sadashivpetimath@stericsson.com> Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org> --- drivers/usb/musb/ux500_dma.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/musb/ux500_dma.c b/drivers/usb/musb/ux500_dma.c index 360c99c..6e3db71 100644 --- a/drivers/usb/musb/ux500_dma.c +++ b/drivers/usb/musb/ux500_dma.c @@ -372,12 +372,17 @@ struct dma_controller *dma_controller_create(struct musb *musb, controller = kzalloc(sizeof(*controller), GFP_KERNEL); if (!controller) - return NULL; + goto kzalloc_fail; controller->private_data = musb; /* Save physical address for DMA controller. */ iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!iomem) { + dev_err(musb->controller, "no memory resource defined\n"); + goto plat_get_fail; + } + controller->phy_base = (dma_addr_t) iomem->start; controller->controller.start = ux500_dma_controller_start; @@ -389,4 +394,9 @@ struct dma_controller *dma_controller_create(struct musb *musb, controller->controller.is_compatible = ux500_dma_is_compatible; return &controller->controller; + +plat_get_fail: + kfree(controller); +kzalloc_fail: + return NULL; } -- 1.8.1.3
| |