[RFC PATCH 11/11] soundwire: intel: free all resources on hw_free()

[Pierre-Louis Bossart]

From: Rander Wang <rander.w...@linux.intel.com>

Make sure all calls to the SoundWire stream API are done and involve
callback

Signed-off-by: Rander Wang <rander.w...@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.boss...@linux.intel.com>
---
 drivers/soundwire/intel.c | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
index 336203303480..60bc5f33afbf 100644
--- a/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@ -879,6 +879,7 @@ static int
 intel_hw_free(struct snd_pcm_substream *substream, struct snd_soc_dai *dai)
 {
        struct sdw_cdns *cdns = snd_soc_dai_get_drvdata(dai);
+       struct sdw_intel *sdw = cdns_to_intel(cdns);
        struct sdw_cdns_dma_data *dma;
        int ret;
 
@@ -886,12 +887,28 @@ intel_hw_free(struct snd_pcm_substream *substream, struct 
snd_soc_dai *dai)
        if (!dma)
                return -EIO;
 
+       ret = sdw_deprepare_stream(dma->stream);
+       if (ret) {
+               dev_err(dai->dev, "sdw_deprepare_stream: failed %d", ret);
+               return ret;
+       }
+
        ret = sdw_stream_remove_master(&cdns->bus, dma->stream);
-       if (ret < 0)
+       if (ret < 0) {
                dev_err(dai->dev, "remove master from stream %s failed: %d\n",
                        dma->stream->name, ret);
+               return ret;
+       }
 
-       return ret;
+       ret = intel_free_stream(sdw, substream, dai, sdw->instance);
+       if (ret < 0) {
+               dev_err(dai->dev, "intel_free_stream: failed %d", ret);
+               return ret;
+       }
+
+       sdw_release_stream(dma->stream);
+
+       return 0;
 }
 
 static void intel_shutdown(struct snd_pcm_substream *substream,
-- 
2.20.1