diff options
| author | Chuhong Yuan <hslester96@gmail.com> | 2019-11-18 15:38:02 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-29 10:21:50 +0100 |
| commit | fe1787af161f91dffcef3a0248b85f0cefdea64b (patch) | |
| tree | 3fc2758834d4b8decdbcd7e6e509a5f811f3862b | |
| parent | 496f5e2f62f5865919cacbf3b75d8f575b09d1f4 (diff) | |
| download | linux-stable-fe1787af161f91dffcef3a0248b85f0cefdea64b.tar.gz linux-stable-fe1787af161f91dffcef3a0248b85f0cefdea64b.tar.bz2 linux-stable-fe1787af161f91dffcef3a0248b85f0cefdea64b.zip | |
dmaengine: ti: edma: fix missed failure handling
[ 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>
| -rw-r--r-- | drivers/dma/edma.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index e508c8c5f3fd..17521fcf226f 100644 --- a/drivers/dma/edma.c +++ b/drivers/dma/edma.c @@ -2288,8 +2288,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", |