Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 399e0f4f authored by Virupax Sadashivpetimath's avatar Virupax Sadashivpetimath Committed by Felipe Balbi
Browse files

usb: musb: ux500_dma: add missing MEM resource check 



Fix dma_controller_create() fail path in case memory resource is
missing.

Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarVirupax Sadashivpetimath <virupax.sadashivpetimath@stericsson.com>
Signed-off-by: default avatarFabio Baltieri <fabio.baltieri@linaro.org>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 9ee1c7fb

drivers/usb/musb/ux500_dma.c

+11 −1
Original line number Diff line number Diff line
@@ -374,12 +374,17 @@ struct dma_controller *dma_controller_create(struct musb *musb, void __iomem *ba 


	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;
@@ -391,4 +396,9 @@ struct dma_controller *dma_controller_create(struct musb *musb, void __iomem *ba 
	controller->controller.is_compatible = ux500_dma_is_compatible;



	return &controller->controller;



plat_get_fail:

	kfree(controller);

kzalloc_fail:

	return NULL;

}