Merge branch 'next/dt2' into HEAD

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

diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
index 5084975..54f580b 100644 (file)
--- a/drivers/dma/imx-dma.c
+++ b/drivers/dma/imx-dma.c
@@ -572,8 +572,8 @@ static void imxdma_tasklet(unsigned long data)
        if (desc->desc.callback)
                desc->desc.callback(desc->desc.callback_param);
 
-       /* If we are dealing with a cyclic descriptor keep it on ld_active
-        * and dont mark the descripor as complete.
+       /* If we are dealing with a cyclic descriptor, keep it on ld_active
+        * and dont mark the descriptor as complete.
         * Only in non-cyclic cases it would be marked as complete
         */
        if (imxdma_chan_is_doing_cyclic(imxdmac))