Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e5132f7 authored by Jie Yang's avatar Jie Yang Committed by Mark Brown
Browse files

ASoC: intel: Revert "ASoC: Intel: fix broadwell module removing failed issue" 



This reverts commit 01f202c7.

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: default avatarJie Yang <yang.jie@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a209d322

sound/soc/intel/haswell/sst-haswell-pcm.c

+1 −3
Original line number Diff line number Diff line
@@ -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)