OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a5b982a
)
dmaengine: ti: edma: Fix error return code in edma_probe()
author
Wei Yongjun
<weiyongjun1@huawei.com>
Thu, 12 Dec 2019 11:46:22 +0000
(11:46 +0000)
committer
Vinod Koul
<vkoul@kernel.org>
Wed, 18 Dec 2019 06:09:34 +0000
(11:39 +0530)
Fix to return negative error code -ENOMEM from the error handling
case instead of 0, as done elsewhere in this function.
Fixes:
2a03c1314506
("dmaengine: ti: edma: add missed operations")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Link:
https://lore.kernel.org/r/20191212114622.127322-1-weiyongjun1@huawei.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/dma/ti/edma.c
patch
|
blob
|
history
diff --git
a/drivers/dma/ti/edma.c
b/drivers/dma/ti/edma.c
index
0628ee4
..
03a7f64
100644
(file)
--- a/
drivers/dma/ti/edma.c
+++ b/
drivers/dma/ti/edma.c
@@
-2342,8
+2342,10
@@
static int edma_probe(struct platform_device *pdev)
ecc->channels_mask = devm_kcalloc(dev,
BITS_TO_LONGS(ecc->num_channels),
sizeof(unsigned long), GFP_KERNEL);
- if (!ecc->slave_chans || !ecc->slot_inuse || !ecc->channels_mask)
+ if (!ecc->slave_chans || !ecc->slot_inuse || !ecc->channels_mask) {
+ ret = -ENOMEM;
goto err_disable_pm;
+ }
/* Mark all channels available initially */
bitmap_fill(ecc->channels_mask, ecc->num_channels);