summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJie Yang <yang.jie@intel.com>2015-05-30 22:33:57 +0800
committerMark Brown <broonie@kernel.org>2015-06-02 15:34:07 +0100
commit6e5132f79a2e441bde4818abdc813859c8064901 (patch)
treec3d5988762df430e111db8747660c0d32019df39
parenta209d322dc803d2bb0c92fe1d0c703ddabae6f28 (diff)
downloadlinux-6e5132f79a2e441bde4818abdc813859c8064901.tar.bz2
ASoC: intel: Revert "ASoC: Intel: fix broadwell module removing failed issue"
This reverts commit 01f202c7b4b40025f3ea4721c52e7f78545e3b07. We shouldn't leave the device as suspended state after module freed, it is not good to do runtime suspend at driver free, here revert this fixing, and replace it with the procedure: suspends firmware ==> frees runtime modules ==> unloads firmware. Signed-off-by: Jie Yang <yang.jie@intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/intel/haswell/sst-haswell-pcm.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/intel/haswell/sst-haswell-pcm.c b/sound/soc/intel/haswell/sst-haswell-pcm.c
index bd96629e0941..23ae0400d6db 100644
--- a/sound/soc/intel/haswell/sst-haswell-pcm.c
+++ b/sound/soc/intel/haswell/sst-haswell-pcm.c
@@ -1118,10 +1118,8 @@ static int hsw_pcm_remove(struct snd_soc_platform *platform)
snd_soc_platform_get_drvdata(platform);
int i;
- /* execute a suspend call to unload all FW resources */
- if (!pm_runtime_status_suspended(platform->dev))
- pm_runtime_put_sync_suspend(platform->dev);
pm_runtime_disable(platform->dev);
+ hsw_pcm_free_modules(priv_data);
for (i = 0; i < ARRAY_SIZE(hsw_dais); i++) {
if (hsw_dais[i].playback.channels_min)