aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <[email protected]>2016-10-17 15:16:35 +0000
committerVinod Koul <[email protected]>2016-10-18 14:48:14 +0000
commitf95df7d6cd92787d54c9ad3d4843f9bcd137f9db (patch)
tree3a17d20c014cf45286a17604527f92d2dd59ec3c
parentLinux 4.9-rc1 (diff)
downloadkernel-f95df7d6cd92787d54c9ad3d4843f9bcd137f9db.tar.gz
kernel-f95df7d6cd92787d54c9ad3d4843f9bcd137f9db.zip
dmaengine: edma: Fix error return code in edma_alloc_chan_resources()
Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
-rw-r--r--drivers/dma/edma.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
index e18a58068bca..77242b37ef87 100644
--- a/drivers/dma/edma.c
+++ b/drivers/dma/edma.c
@@ -1628,6 +1628,7 @@ static int edma_alloc_chan_resources(struct dma_chan *chan)
if (echan->slot[0] < 0) {
dev_err(dev, "Entry slot allocation failed for channel %u\n",
EDMA_CHAN_SLOT(echan->ch_num));
+ ret = echan->slot[0];
goto err_slot;
}