diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-05-06 23:38:00 +0200 | 
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-05-06 23:38:00 +0200 | 
| commit | 4183bef2e093a2f0aab45f2d5fed82b0e02aeacf (patch) | |
| tree | e84c484db3746a0f3ead0fb7a2bb9e5a42b89e85 /drivers/dma/omap-dma.c | |
| parent | 662478d060a39b8faf2b1fe2fbbb212556c2e052 (diff) | |
| parent | 775c4f66fd855e68a98fc5049003810fe98e2e20 (diff) | |
| download | olio-linux-3.10-4183bef2e093a2f0aab45f2d5fed82b0e02aeacf.tar.xz olio-linux-3.10-4183bef2e093a2f0aab45f2d5fed82b0e02aeacf.zip  | |
Merge branch 'late/dt' into next/dt2
This is support for the ARM Chromebook, originally scheduled
as a "late" pull request. Since it's already late now, we
can combine this into the existing next/dt2 branch.
* late/dt:
  ARM: exynos: dts: cros5250: add EC device
  ARM: dts: Add sbs-battery for exynos5250-snow
  ARM: dts: Add i2c-arbitrator bus for exynos5250-snow
  ARM: dts: Add chip-id controller node on Exynos4/5 SoC
  ARM: EXYNOS: Create virtual I/O mapping for Chip-ID controller using device tree
Diffstat (limited to 'drivers/dma/omap-dma.c')
| -rw-r--r-- | drivers/dma/omap-dma.c | 20 | 
1 files changed, 14 insertions, 6 deletions
diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c index c4b4fd2acc4..08b43bf3715 100644 --- a/drivers/dma/omap-dma.c +++ b/drivers/dma/omap-dma.c @@ -276,12 +276,20 @@ static void omap_dma_issue_pending(struct dma_chan *chan)  	spin_lock_irqsave(&c->vc.lock, flags);  	if (vchan_issue_pending(&c->vc) && !c->desc) { -		struct omap_dmadev *d = to_omap_dma_dev(chan->device); -		spin_lock(&d->lock); -		if (list_empty(&c->node)) -			list_add_tail(&c->node, &d->pending); -		spin_unlock(&d->lock); -		tasklet_schedule(&d->task); +		/* +		 * c->cyclic is used only by audio and in this case the DMA need +		 * to be started without delay. +		 */ +		if (!c->cyclic) { +			struct omap_dmadev *d = to_omap_dma_dev(chan->device); +			spin_lock(&d->lock); +			if (list_empty(&c->node)) +				list_add_tail(&c->node, &d->pending); +			spin_unlock(&d->lock); +			tasklet_schedule(&d->task); +		} else { +			omap_dma_start_desc(c); +		}  	}  	spin_unlock_irqrestore(&c->vc.lock, flags);  }  |