]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ASoC: qdsp6: q6afe-dai: do not close port if its not opened
authorSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Wed, 4 Jul 2018 09:49:43 +0000 (10:49 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 4 Jul 2018 14:34:48 +0000 (15:34 +0100)
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 <srinivas.kandagatla@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/qcom/qdsp6/q6afe-dai.c

index 5002dd05bf276496a5d30424e8754e7c83869161..a373ca5523ffd2fc46cb7b25d2d56c255e5b7e81 100644 (file)
@@ -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);