summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorVinod Koul <vkoul@kernel.org>2019-03-12 12:04:16 +0530
committerVinod Koul <vkoul@kernel.org>2019-03-12 12:04:16 +0530
commit1602a335708ae396e8bcc0c430d8e3d90254881f (patch)
tree8e5b00a0099381a2fa1d0f3f5140ea7a28824ea3 /drivers/dma
parent989e3af3af27a6cc486b64b21628a07fa021ebe9 (diff)
parent7c97381e7a9a5ec359007c0d491a143e3d9f787c (diff)
downloadlinux-1602a335708ae396e8bcc0c430d8e3d90254881f.tar.bz2
Merge branch 'topic/mv' into for-linus
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/mv_xor.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c
index fe4a7c71fede..65af2e7fcb2c 100644
--- a/drivers/dma/mv_xor.c
+++ b/drivers/dma/mv_xor.c
@@ -1153,7 +1153,10 @@ mv_xor_channel_add(struct mv_xor_device *xordev,
dma_has_cap(DMA_MEMCPY, dma_dev->cap_mask) ? "cpy " : "",
dma_has_cap(DMA_INTERRUPT, dma_dev->cap_mask) ? "intr " : "");
- dma_async_device_register(dma_dev);
+ ret = dma_async_device_register(dma_dev);
+ if (ret)
+ goto err_free_irq;
+
return mv_chan;
err_free_irq: