ASoC: Intel: Fix pcm stream context restore crash

In some cases the pcm stream is closed while context has been
scheduled to be restored, causing a null pointer deref panic.
Cancel work to ensure stream does not get freed while work is
still active/pending.

Also, restoring the pcm context can be safely skipped after the
stream has been stopped. Check if pcm stream is still running
before restoring stream context to help pending work finish
more quickly in stream close path.

Signed-off-by: Kevin Strasser <kevin.strasser@intel.com>
Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/sound/soc/intel/sst-baytrail-pcm.c b/sound/soc/intel/sst-baytrail-pcm.c
index 6242ccce2bb79318ef8c90bd52599b8356576f2a..3af38576e91eeb961269f14261316443ff5c56bd 100644 (file)
--- a/sound/soc/intel/sst-baytrail-pcm.c
+++ b/sound/soc/intel/sst-baytrail-pcm.c
@@ -164,7 +164,8 @@ static void sst_byt_pcm_work(struct work_struct *work)
        struct sst_byt_pcm_data *pcm_data =
                container_of(work, struct sst_byt_pcm_data, work);
 
-       sst_byt_pcm_restore_stream_context(pcm_data->substream);
+       if (snd_pcm_running(pcm_data->substream))
+               sst_byt_pcm_restore_stream_context(pcm_data->substream);
 }
 
 static int sst_byt_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
@@ -277,6 +278,7 @@ static int sst_byt_pcm_close(struct snd_pcm_substream *substream)
 
        dev_dbg(rtd->dev, "PCM: close\n");
 
+       cancel_work_sync(&pcm_data->work);
        mutex_lock(&pcm_data->mutex);
        ret = sst_byt_stream_free(byt, pcm_data->stream);
        if (ret < 0) {