OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
496f5e2
)
dmaengine: ti: edma: fix missed failure handling
author
Chuhong Yuan
<hslester96@gmail.com>
Mon, 18 Nov 2019 07:38:02 +0000
(15:38 +0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 29 Jan 2020 09:21:50 +0000
(10:21 +0100)
[ 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
patch
|
blob
|
history
diff --git
a/drivers/dma/edma.c
b/drivers/dma/edma.c
index
e508c8c
..
17521fc
100644
(file)
--- 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",