diff options
| author | Robin Gong <b38343@freescale.com> | 2014-12-23 16:07:36 +0800 |
|---|---|---|
| committer | Nitin Garg <nitin.garg@nxp.com> | 2016-01-14 10:59:35 -0600 |
| commit | dd84f5b97feec5bd7efc30d7a9f709f75c3eb5c5 (patch) | |
| tree | 3c63bc534e021258eb3b0b0e130c1f81b17a24d8 /drivers/dma | |
| parent | 8e53d97721aa5ade07bc3bd0bd8ab3dc14a83c32 (diff) | |
MLK-10053 dma: imx-sdma: fix building error
Caused by cherry-pick 260fe87c1d744d8386057d03013e002352f8b181, current
sdma driver remove 'sdmac->mode'.
Signed-off-by: Robin Gong <b38343@freescale.com>
(cherry picked from commit 0d45a4e18f469535b890399907e32c26abe4ef1c)
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/imx-sdma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 3bbb04dcf212..193fe922d778 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -764,7 +764,7 @@ static void sdma_tasklet(unsigned long data) unsigned long flags; spin_lock_irqsave(&sdmac->lock, flags); - if (sdmac->status != DMA_IN_PROGRESS) { + if (sdmac->status != DMA_IN_PROGRESS && !(sdmac->flags & IMX_DMA_SG_LOOP)) { spin_unlock_irqrestore(&sdmac->lock, flags); return; } @@ -795,7 +795,7 @@ static irqreturn_t sdma_int_handler(int irq, void *dev_id) sdma_update_channel_loop(sdmac); spin_lock_irqsave(&sdmac->lock, flags); - if (sdmac->status == DMA_IN_PROGRESS) + if (sdmac->status == DMA_IN_PROGRESS || (sdmac->flags & IMX_DMA_SG_LOOP)) tasklet_schedule(&sdmac->tasklet); spin_unlock_irqrestore(&sdmac->lock, flags); |