1 files changed, 9 insertions, 6 deletions

diff --git a/sound/soc/intel/sst-haswell-ipc.c b/sound/soc/intel/sst-haswell-ipc.c
index e7996b39a484..434236343ddf 100644
--- a/sound/soc/intel/sst-haswell-ipc.c
+++ b/sound/soc/intel/sst-haswell-ipc.c
@@ -25,7 +25,6 @@
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/sched.h>
-#include <linux/list.h>
 #include <linux/platform_device.h>
 #include <linux/kthread.h>
 #include <linux/firmware.h>
@@ -1730,17 +1729,17 @@ int sst_hsw_dsp_init(struct device *dev, struct sst_pdata *pdata)
 
         ret = msg_empty_list_init(hsw);
         if (ret < 0)
-                goto list_err;
+                return -ENOMEM;
 
         /* start the IPC message thread */
         init_kthread_worker(&hsw->kworker);
         hsw->tx_thread = kthread_run(kthread_worker_fn,
-                                           &hsw->kworker,
+                                           &hsw->kworker, "%s",
                                            dev_name(hsw->dev));
         if (IS_ERR(hsw->tx_thread)) {
                 ret = PTR_ERR(hsw->tx_thread);
                 dev_err(hsw->dev, "error: failed to create message TX task\n");
-                goto list_err;
+                goto err_free_msg;
         }
         init_kthread_work(&hsw->kwork, ipc_tx_msgs);
 
@@ -1750,7 +1749,7 @@ int sst_hsw_dsp_init(struct device *dev, struct sst_pdata *pdata)
         hsw->dsp = sst_dsp_new(dev, &hsw_dev, pdata);
         if (hsw->dsp == NULL) {
                 ret = -ENODEV;
-                goto list_err;
+                goto dsp_err;
         }
 
         /* keep the DSP in reset state for base FW loading */
@@ -1794,8 +1793,11 @@ boot_err:
         sst_fw_free(hsw_sst_fw);
 fw_err:
         sst_dsp_free(hsw->dsp);
+dsp_err:
+        kthread_stop(hsw->tx_thread);
+err_free_msg:
         kfree(hsw->msg);
-list_err:
+
         return ret;
 }
 EXPORT_SYMBOL_GPL(sst_hsw_dsp_init);
@@ -1808,6 +1810,7 @@ void sst_hsw_dsp_free(struct device *dev, struct sst_pdata *pdata)
         sst_fw_free_all(hsw->dsp);
         sst_dsp_free(hsw->dsp);
         kfree(hsw->scratch);
+        kthread_stop(hsw->tx_thread);
         kfree(hsw->msg);
 }
 EXPORT_SYMBOL_GPL(sst_hsw_dsp_free);