Merge branch 'topic/mv' into for-linus

diff --combined drivers/dma/mv_xor.c
index fe4a7c71fedebedd9176e8e82875ada8046d772d,e733c5eeaabc6ad68ef6c198b291e182966422bf..65af2e7fcb2c4c21fe985519c27db829c88d2fea
--- 1/drivers/dma/mv_xor.c
--- 2/drivers/dma/mv_xor.c
+++ b/drivers/dma/mv_xor.c
@@@ -1059,7 -1059,6 +1059,7 @@@ mv_xor_channel_add(struct mv_xor_devic
                mv_chan->op_in_desc = XOR_MODE_IN_DESC;
  
        dma_dev = &mv_chan->dmadev;
 +      dma_dev->dev = &pdev->dev;
        mv_chan->xordev = xordev;
  
        /*
@@@ -1092,6 -1091,7 +1092,6 @@@
        dma_dev->device_free_chan_resources = mv_xor_free_chan_resources;
        dma_dev->device_tx_status = mv_xor_status;
        dma_dev->device_issue_pending = mv_xor_issue_pending;
 -      dma_dev->dev = &pdev->dev;
  
        /* set prep routines based on capability */
        if (dma_has_cap(DMA_INTERRUPT, dma_dev->cap_mask))
@@@ -1153,7 -1153,10 +1153,10 @@@
                 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: