From dce5829b6f2544ee775b4f723547b096e3e5c074 Mon Sep 17 00:00:00 2001 From: Jie Yang Date: Sat, 30 May 2015 22:33:57 +0800 Subject: [PATCH] ASoC: intel: Revert "ASoC: Intel: fix broadwell module removing failed issue" This reverts commit adcff2d924c763d548d82011fb6df59ebe034c35. 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 Signed-off-by: Mark Brown --- sound/soc/intel/haswell/sst-haswell-pcm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sound/soc/intel/haswell/sst-haswell-pcm.c b/sound/soc/intel/haswell/sst-haswell-pcm.c index bd96629e09414..23ae0400d6db9 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) -- 2.39.5