diff options
| author | Vinod Koul <vkoul@kernel.org> | 2019-03-12 02:34:16 -0400 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2019-03-12 02:34:16 -0400 |
| commit | 1602a335708ae396e8bcc0c430d8e3d90254881f (patch) | |
| tree | 8e5b00a0099381a2fa1d0f3f5140ea7a28824ea3 | |
| parent | 989e3af3af27a6cc486b64b21628a07fa021ebe9 (diff) | |
| parent | 7c97381e7a9a5ec359007c0d491a143e3d9f787c (diff) | |
Merge branch 'topic/mv' into for-linus
| -rw-r--r-- | drivers/dma/mv_xor.c | 5 |
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, | |||
| 1153 | dma_has_cap(DMA_MEMCPY, dma_dev->cap_mask) ? "cpy " : "", | 1153 | dma_has_cap(DMA_MEMCPY, dma_dev->cap_mask) ? "cpy " : "", |
| 1154 | dma_has_cap(DMA_INTERRUPT, dma_dev->cap_mask) ? "intr " : ""); | 1154 | dma_has_cap(DMA_INTERRUPT, dma_dev->cap_mask) ? "intr " : ""); |
| 1155 | 1155 | ||
| 1156 | dma_async_device_register(dma_dev); | 1156 | ret = dma_async_device_register(dma_dev); |
| 1157 | if (ret) | ||
| 1158 | goto err_free_irq; | ||
| 1159 | |||
| 1157 | return mv_chan; | 1160 | return mv_chan; |
| 1158 | 1161 | ||
| 1159 | err_free_irq: | 1162 | err_free_irq: |