From: Srinivas Kandagatla Date: Wed, 4 Jul 2018 09:49:43 +0000 (+0100) Subject: ASoC: qdsp6: q6afe-dai: do not close port if its not opened X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=110743189c863e96dc08a581d56c50b965870a3f;p=openwrt%2Fstaging%2Fblogic.git ASoC: qdsp6: q6afe-dai: do not close port if its not opened afe 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 Signed-off-by: Mark Brown --- diff --git a/sound/soc/qcom/qdsp6/q6afe-dai.c b/sound/soc/qcom/qdsp6/q6afe-dai.c index 5002dd05bf27..a373ca5523ff 100644 --- a/sound/soc/qcom/qdsp6/q6afe-dai.c +++ b/sound/soc/qcom/qdsp6/q6afe-dai.c @@ -315,6 +315,9 @@ static void q6afe_dai_shutdown(struct snd_pcm_substream *substream, struct q6afe_dai_data *dai_data = dev_get_drvdata(dai->dev); int rc; + if (!dai_data->is_port_started[dai->id]) + return; + rc = q6afe_port_stop(dai_data->port[dai->id]); if (rc < 0) dev_err(dai->dev, "fail to close AFE port (%d)\n", rc);