aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/intel/sst-baytrail-ipc.c
diff options
context:
space:
mode:
authorImre Deak <imre.deak@intel.com>2014-05-30 03:52:29 -0400
committerMark Brown <broonie@linaro.org>2014-06-01 06:44:49 -0400
commit9cf0e4520d45d5425f3a5257d346e3310e1a63b4 (patch)
treec945bd6203f272bdd44a23878370ec0a62d6be3a /sound/soc/intel/sst-baytrail-ipc.c
parent9b351d46893e827940e2e8da04f1791e8ec452ca (diff)
ASoC: Intel: byt/hsw: Add missing kthread_stop to error/cleanup path
Baytrail and Haswell SST IPC don't stop the kernel thread in error and cleanup path thus leaving orphan kernel thread behind in such a case. Also while at it, fix one error path in sst-haswell-ipc.c that doesn't free hsw->msg. [Jarkko: I edited the commit log a little] Signed-off-by: Imre Deak <imre.deak@intel.com> Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/intel/sst-baytrail-ipc.c')
-rw-r--r--sound/soc/intel/sst-baytrail-ipc.c5
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)
907 byt->dsp = sst_dsp_new(dev, &byt_dev, pdata); 907 byt->dsp = sst_dsp_new(dev, &byt_dev, pdata);
908 if (byt->dsp == NULL) { 908 if (byt->dsp == NULL) {
909 err = -ENODEV; 909 err = -ENODEV;
910 goto err_free_msg; 910 goto dsp_err;
911 } 911 }
912 912
913 /* keep the DSP in reset state for base FW loading */ 913 /* keep the DSP in reset state for base FW loading */
@@ -940,6 +940,8 @@ boot_err:
940 sst_fw_free(byt_sst_fw); 940 sst_fw_free(byt_sst_fw);
941fw_err: 941fw_err:
942 sst_dsp_free(byt->dsp); 942 sst_dsp_free(byt->dsp);
943dsp_err:
944 kthread_stop(byt->tx_thread);
943err_free_msg: 945err_free_msg:
944 kfree(byt->msg); 946 kfree(byt->msg);
945 947
@@ -954,6 +956,7 @@ void sst_byt_dsp_free(struct device *dev, struct sst_pdata *pdata)
954 sst_dsp_reset(byt->dsp); 956 sst_dsp_reset(byt->dsp);
955 sst_fw_free_all(byt->dsp); 957 sst_fw_free_all(byt->dsp);
956 sst_dsp_free(byt->dsp); 958 sst_dsp_free(byt->dsp);
959 kthread_stop(byt->tx_thread);
957 kfree(byt->msg); 960 kfree(byt->msg);
958} 961}
959EXPORT_SYMBOL_GPL(sst_byt_dsp_free); 962EXPORT_SYMBOL_GPL(sst_byt_dsp_free);