Message ID | 20191109113523.6067-1-sst2005@gmail.com (mailing list archive) |
---|---|
State | Mainlined |
Commit | 1ff95243257fad07290dcbc5f7a6ad79d6e703e2 |
Headers | show |
Series | [v1] dmaengine: mediatek: hsdma_probe: fixed a memory leak when devm_request_irq fails | expand |
Hi Satendra, On 09-11-19, 17:05, Satendra Singh Thakur wrote: > When devm_request_irq fails, currently, the function > dma_async_device_unregister gets called. This doesn't free > the resources allocated by of_dma_controller_register. > Therefore, we have called of_dma_controller_free for this purpose. This should have been a v2! Anyway I have applied this and other patch Thanks
diff --git a/drivers/dma/mediatek/mtk-hsdma.c b/drivers/dma/mediatek/mtk-hsdma.c index 1a2028e1c29e..4c58da742143 100644 --- a/drivers/dma/mediatek/mtk-hsdma.c +++ b/drivers/dma/mediatek/mtk-hsdma.c @@ -997,7 +997,7 @@ static int mtk_hsdma_probe(struct platform_device *pdev) if (err) { dev_err(&pdev->dev, "request_irq failed with err %d\n", err); - goto err_unregister; + goto err_free; } platform_set_drvdata(pdev, hsdma); @@ -1006,6 +1006,8 @@ static int mtk_hsdma_probe(struct platform_device *pdev) return 0; +err_free: + of_dma_controller_free(pdev->dev.of_node); err_unregister: dma_async_device_unregister(dd);
When devm_request_irq fails, currently, the function dma_async_device_unregister gets called. This doesn't free the resources allocated by of_dma_controller_register. Therefore, we have called of_dma_controller_free for this purpose. Signed-off-by: Satendra Singh Thakur <sst2005@gmail.com> --- v1: modified the subject line with new tags drivers/dma/mediatek/mtk-hsdma.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)