Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux.git] / drivers / dma / imx-dma.c

diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
index 6f9ac2022abd8b3d23c739bc7face1cf662a39f3..286660a12cc695b699b1e319968f89e148431dad 100644 (file)
--- a/drivers/dma/imx-dma.c
+++ b/drivers/dma/imx-dma.c
@@ -422,12 +422,12 @@ static irqreturn_t imxdma_err_handler(int irq, void *dev_id)
                /* Tasklet error handler */
                tasklet_schedule(&imxdma->channel[i].dma_tasklet);
 
-               printk(KERN_WARNING
-                      "DMA timeout on channel %d -%s%s%s%s\n", i,
-                      errcode & IMX_DMA_ERR_BURST ?    " burst" : "",
-                      errcode & IMX_DMA_ERR_REQUEST ?  " request" : "",
-                      errcode & IMX_DMA_ERR_TRANSFER ? " transfer" : "",
-                      errcode & IMX_DMA_ERR_BUFFER ?   " buffer" : "");
+               dev_warn(imxdma->dev,
+                        "DMA timeout on channel %d -%s%s%s%s\n", i,
+                        errcode & IMX_DMA_ERR_BURST ?    " burst" : "",
+                        errcode & IMX_DMA_ERR_REQUEST ?  " request" : "",
+                        errcode & IMX_DMA_ERR_TRANSFER ? " transfer" : "",
+                        errcode & IMX_DMA_ERR_BUFFER ?   " buffer" : "");
        }
        return IRQ_HANDLED;
 }
@@ -1236,6 +1236,7 @@ static int imxdma_remove(struct platform_device *pdev)
 static struct platform_driver imxdma_driver = {
        .driver         = {
                .name   = "imx-dma",
+               .owner  = THIS_MODULE,
                .of_match_table = imx_dma_of_dev_id,
        },
        .id_table       = imx_dma_devtype,