| From 086d7c90f14698037ef20590771280dab6815034 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 18 Nov 2019 15:38:02 +0800 |
| Subject: dmaengine: ti: edma: fix missed failure handling |
| |
| From: Chuhong Yuan <hslester96@gmail.com> |
| |
| [ Upstream commit 340049d453682a9fe8d91fe794dd091730f4bb25 ] |
| |
| When devm_kcalloc fails, it forgets to call edma_free_slot. |
| Replace direct return with failure handler to fix it. |
| |
| Fixes: 1be5336bc7ba ("dmaengine: edma: New device tree binding") |
| Signed-off-by: Chuhong Yuan <hslester96@gmail.com> |
| Link: https://lore.kernel.org/r/20191118073802.28424-1-hslester96@gmail.com |
| Signed-off-by: Vinod Koul <vkoul@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/dma/edma.c | 6 ++++-- |
| 1 file changed, 4 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c |
| index 72f31e837b1d5..56ec724687456 100644 |
| --- a/drivers/dma/edma.c |
| +++ b/drivers/dma/edma.c |
| @@ -2340,8 +2340,10 @@ static int edma_probe(struct platform_device *pdev) |
| |
| ecc->tc_list = devm_kcalloc(dev, ecc->num_tc, |
| sizeof(*ecc->tc_list), GFP_KERNEL); |
| - if (!ecc->tc_list) |
| - return -ENOMEM; |
| + if (!ecc->tc_list) { |
| + ret = -ENOMEM; |
| + goto err_reg1; |
| + } |
| |
| for (i = 0;; i++) { |
| ret = of_parse_phandle_with_fixed_args(node, "ti,tptcs", |
| -- |
| 2.20.1 |
| |
