summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorSrinivas Kandagatla <srinivas.kandagatla@linaro.org>2018-07-04 10:49:44 +0100
committerMark Brown <broonie@kernel.org>2018-07-04 15:34:48 +0100
commit5dffc1752cabde6396fca28ff8343febfa524512 (patch)
treec9c966a5514f7f9e0fb59035b63e7ff4c550f4c9 /sound/soc
parent110743189c863e96dc08a581d56c50b965870a3f (diff)
downloadlinux-stable-5dffc1752cabde6396fca28ff8343febfa524512.tar.gz
linux-stable-5dffc1752cabde6396fca28ff8343febfa524512.tar.bz2
linux-stable-5dffc1752cabde6396fca28ff8343febfa524512.zip
ASoC: qdsp6: q6asm-dai: do not close port if its not opened
asm ports are open as part of prepare, so for use cases like "aplay sample.wav" were sample.wav is not present. This would call port close eventhough port was never opened. DSP would return errors for such use cases. Avoid doing this by checking the port state. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/qcom/qdsp6/q6asm-dai.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/qcom/qdsp6/q6asm-dai.c b/sound/soc/qcom/qdsp6/q6asm-dai.c
index 349c6a883c63..360936703b3d 100644
--- a/sound/soc/qcom/qdsp6/q6asm-dai.c
+++ b/sound/soc/qcom/qdsp6/q6asm-dai.c
@@ -390,7 +390,9 @@ static int q6asm_dai_close(struct snd_pcm_substream *substream)
struct q6asm_dai_rtd *prtd = runtime->private_data;
if (prtd->audio_client) {
- q6asm_cmd(prtd->audio_client, CMD_CLOSE);
+ if (prtd->state)
+ q6asm_cmd(prtd->audio_client, CMD_CLOSE);
+
q6asm_unmap_memory_regions(substream->stream,
prtd->audio_client);
q6asm_audio_client_free(prtd->audio_client);