Merge branch 'topic/mv' into for-linus

[linux-2.6-block.git] / drivers / dma / mv_xor.c

diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c
index fe4a7c71fedebedd9176e8e82875ada8046d772d..65af2e7fcb2c4c21fe985519c27db829c88d2fea 100644 (file)
--- 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: