soundwire: intel: free all resources on hw_free()

Make sure all calls to the SoundWire stream API are done and involve
callback. Also kfree the stream name.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Rander Wang <rander.wang@linux.intel.com>
Acked-by: Sanyog Kale <sanyog.r.kale@intel.com>
Link: https://lore.kernel.org/r/20200215014740.27580-6-pierre-louis.bossart@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
index c498812522ab80a31b869867b919de10667a5eb5..a327669c757b8d41c7e6d407f9eab682a18c8d20 100644 (file)
--- a/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@ -550,6 +550,25 @@ static int intel_params_stream(struct sdw_intel *sdw,
        return -EIO;
 }
 
+static int intel_free_stream(struct sdw_intel *sdw,
+                            struct snd_pcm_substream *substream,
+                            struct snd_soc_dai *dai,
+                            int link_id)
+{
+       struct sdw_intel_link_res *res = sdw->link_res;
+       struct sdw_intel_stream_free_data free_data;
+
+       free_data.substream = substream;
+       free_data.dai = dai;
+       free_data.link_id = link_id;
+
+       if (res->ops && res->ops->free_stream && res->dev)
+               return res->ops->free_stream(res->dev,
+                                            &free_data);
+
+       return 0;
+}
+
 /*
  * bank switch routines
  */
@@ -817,6 +836,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;
 
@@ -824,12 +844,29 @@ 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;
+       }
+
+       kfree(dma->stream->name);
+       sdw_release_stream(dma->stream);
+
+       return 0;
 }
 
 static void intel_shutdown(struct snd_pcm_substream *substream,