diff options
Diffstat (limited to 'drivers/dma/imx-dma.c')
-rw-r--r-- | drivers/dma/imx-dma.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c index 6f9ac2022abd..286660a12cc6 100644 --- 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) | |||
422 | /* Tasklet error handler */ | 422 | /* Tasklet error handler */ |
423 | tasklet_schedule(&imxdma->channel[i].dma_tasklet); | 423 | tasklet_schedule(&imxdma->channel[i].dma_tasklet); |
424 | 424 | ||
425 | printk(KERN_WARNING | 425 | dev_warn(imxdma->dev, |
426 | "DMA timeout on channel %d -%s%s%s%s\n", i, | 426 | "DMA timeout on channel %d -%s%s%s%s\n", i, |
427 | errcode & IMX_DMA_ERR_BURST ? " burst" : "", | 427 | errcode & IMX_DMA_ERR_BURST ? " burst" : "", |
428 | errcode & IMX_DMA_ERR_REQUEST ? " request" : "", | 428 | errcode & IMX_DMA_ERR_REQUEST ? " request" : "", |
429 | errcode & IMX_DMA_ERR_TRANSFER ? " transfer" : "", | 429 | errcode & IMX_DMA_ERR_TRANSFER ? " transfer" : "", |
430 | errcode & IMX_DMA_ERR_BUFFER ? " buffer" : ""); | 430 | errcode & IMX_DMA_ERR_BUFFER ? " buffer" : ""); |
431 | } | 431 | } |
432 | return IRQ_HANDLED; | 432 | return IRQ_HANDLED; |
433 | } | 433 | } |
@@ -1236,6 +1236,7 @@ static int imxdma_remove(struct platform_device *pdev) | |||
1236 | static struct platform_driver imxdma_driver = { | 1236 | static struct platform_driver imxdma_driver = { |
1237 | .driver = { | 1237 | .driver = { |
1238 | .name = "imx-dma", | 1238 | .name = "imx-dma", |
1239 | .owner = THIS_MODULE, | ||
1239 | .of_match_table = imx_dma_of_dev_id, | 1240 | .of_match_table = imx_dma_of_dev_id, |
1240 | }, | 1241 | }, |
1241 | .id_table = imx_dma_devtype, | 1242 | .id_table = imx_dma_devtype, |