diff options
| author | Ola Lilja <ola.o.lilja@stericsson.com> | 2010-12-06 09:06:56 +0100 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:14:43 +0200 |
| commit | 5b2cc7200922df444f0a1b779e7166bfc42d1d2a (patch) | |
| tree | edecb1ac811325d6453632035216710da703bc50 /sound | |
| parent | fe1e8e8b6b8637eda7fb33dc9b98a4d3ec9d7f37 (diff) | |
Ux500 ASoC: Fix for for audio capture.
Flag added in private struct for audio capture.
Change-Id: I8e5a93c386e0c22d3350018e79e786849cbed497
Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/10296
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/ux500/ux500_msp_dai.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c index 6a4574c0931..18aa608a602 100644 --- a/sound/soc/ux500/ux500_msp_dai.c +++ b/sound/soc/ux500/ux500_msp_dai.c @@ -85,6 +85,12 @@ int ux500_msp_dai_i2s_configure_sg(dma_addr_t dma_addr, int i; int ret = 0; struct scatterlist *sg; + bool playback_req_valid = + (drvdata->playback_active && + stream_id == SNDRV_PCM_STREAM_PLAYBACK); + bool capture_req_valid = + (drvdata->capture_active && + stream_id == SNDRV_PCM_STREAM_CAPTURE); pr_debug("%s: Enter (MSP Index: %u, SG-length: %u, SG-size: %u).\n", __func__, @@ -92,7 +98,7 @@ int ux500_msp_dai_i2s_configure_sg(dma_addr_t dma_addr, sg_len, sg_size); - if (!drvdata->playback_active) { + if (!playback_req_valid && !capture_req_valid) { pr_err("%s: The I2S controller is not available." "MSP index:%d\n", __func__, |