ASoC: qcom: q6asm-dai: perform correct state check before closing

commit bfbb12dfa144d45575bcfe139a71360b3ce80237 upstream.

Do not stop a q6asm stream if its not started, this can result in
unnecessary dsp command which will timeout anyway something like below:

q6asm-dai ab00000.remoteproc:glink-edge:apr:service@7:dais: CMD 10bcd timeout

Fix this by correctly checking the state.

Fixes: 2a9e92d371db ("ASoC: qdsp6: q6asm: Add q6asm dai driver")
Cc: Stable@vger.kernel.org
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
Tested-by: Alexey Klimov <alexey.klimov@linaro.org> # RB5, RB3
Link: https://patch.msgid.link/20251023102444.88158-5-srinivas.kandagatla@oss.qualcomm.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/sound/soc/qcom/qdsp6/q6asm-dai.c b/sound/soc/qcom/qdsp6/q6asm-dai.c
index ad2c9788e3217bbb0f979debb544c0f274d3a94d..930d94cabd561cbae6fbc8d26fa546e3291ee441 100644 (file)
--- a/sound/soc/qcom/qdsp6/q6asm-dai.c
+++ b/sound/soc/qcom/qdsp6/q6asm-dai.c
@@ -237,13 +237,14 @@ static int q6asm_dai_prepare(struct snd_soc_component *component,
        prtd->pcm_count = snd_pcm_lib_period_bytes(substream);
        prtd->pcm_irq_pos = 0;
        /* rate and channels are sent to audio driver */
-       if (prtd->state) {
+       if (prtd->state == Q6ASM_STREAM_RUNNING) {
                /* clear the previous setup if any  */
                q6asm_cmd(prtd->audio_client, prtd->stream_id, CMD_CLOSE);
                q6asm_unmap_memory_regions(substream->stream,
                                           prtd->audio_client);
                q6routing_stream_close(soc_prtd->dai_link->id,
                                         substream->stream);
+               prtd->state = Q6ASM_STREAM_STOPPED;
        }
 
        ret = q6asm_map_memory_regions(substream->stream, prtd->audio_client,