1 files changed, 4 insertions, 1 deletions

diff --git a/sound/soc/intel/sst-baytrail-ipc.c b/sound/soc/intel/sst-baytrail-ipc.c
index 18273d26718a..40a25fce0faa 100644
--- a/sound/soc/intel/sst-baytrail-ipc.c
+++ b/sound/soc/intel/sst-baytrail-ipc.c
@@ -907,7 +907,7 @@ int sst_byt_dsp_init(struct device *dev, struct sst_pdata *pdata)
         byt->dsp = sst_dsp_new(dev, &byt_dev, pdata);
         if (byt->dsp == NULL) {
                 err = -ENODEV;
-                goto err_free_msg;
+                goto dsp_err;
         }
 
         /* keep the DSP in reset state for base FW loading */
@@ -940,6 +940,8 @@ boot_err:
         sst_fw_free(byt_sst_fw);
 fw_err:
         sst_dsp_free(byt->dsp);
+dsp_err:
+        kthread_stop(byt->tx_thread);
 err_free_msg:
         kfree(byt->msg);
 
@@ -954,6 +956,7 @@ void sst_byt_dsp_free(struct device *dev, struct sst_pdata *pdata)
         sst_dsp_reset(byt->dsp);
         sst_fw_free_all(byt->dsp);
         sst_dsp_free(byt->dsp);
+        kthread_stop(byt->tx_thread);
         kfree(byt->msg);
 }
 EXPORT_SYMBOL_GPL(sst_byt_dsp_free);