diff options
| author | Liam Girdwood <lrg@ti.com> | 2011-07-24 15:59:47 -0400 |
|---|---|---|
| committer | Paolo Pisati <paolo.pisati@canonical.com> | 2012-08-17 04:18:27 -0400 |
| commit | 511032224d039591e1444c15f0915ce8b91a72e1 (patch) | |
| tree | d7a3755821ea8c7e49aeb5824b7003547ba750c3 /sound/soc/omap/omap-pcm.c | |
| parent | 36f70bff2bcd3dde236ac2c5595414bcd156cbdd (diff) | |
Subject: [PATCH 085/104] ASoC: OMAP4 PCM - make sure self linked DMA is really stopped (fixme)
Make sure OMAP self linked DMA is really stopped.
FIXME: this needs a counter so we dont lock up.
Signed-off-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound/soc/omap/omap-pcm.c')
| -rw-r--r-- | sound/soc/omap/omap-pcm.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c index 4e6fef29b51..28cc3a61b63 100644 --- a/sound/soc/omap/omap-pcm.c +++ b/sound/soc/omap/omap-pcm.c | |||
| @@ -235,6 +235,11 @@ static int omap_pcm_trigger(struct snd_pcm_substream *substream, int cmd) | |||
| 235 | case SNDRV_PCM_TRIGGER_PAUSE_PUSH: | 235 | case SNDRV_PCM_TRIGGER_PAUSE_PUSH: |
| 236 | prtd->period_index = -1; | 236 | prtd->period_index = -1; |
| 237 | omap_stop_dma(prtd->dma_ch); | 237 | omap_stop_dma(prtd->dma_ch); |
| 238 | /* Since we are using self linking, there is a | ||
| 239 | chance that the DMA as re-enabled the channel | ||
| 240 | just after disabling it */ | ||
| 241 | while (omap_get_dma_active_status(prtd->dma_ch)) | ||
| 242 | omap_stop_dma(prtd->dma_ch); | ||
| 238 | break; | 243 | break; |
| 239 | default: | 244 | default: |
| 240 | ret = -EINVAL; | 245 | ret = -EINVAL; |