Merge branch 'topic/mv' into for-linus

1602a335 · Vinod Koul · 989e3af3 · 7c97381e · 1602a335
Commit 1602a335 authored Mar 12, 2019 by Vinod Koul
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

drivers/dma/mv_xor.c drivers/dma/mv_xor.c +4 -1

No files found.
--- 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: