Skip to content

Commit

Permalink
ASoC: intel: Revert "ASoC: Intel: fix broadwell module removing faile…
Browse files Browse the repository at this point in the history
…d issue"

This reverts commit 01f202c.

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>
  • Loading branch information
Jie Yang authored and Mark Brown committed Jun 2, 2015
1 parent a209d32 commit 6e5132f
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions sound/soc/intel/haswell/sst-haswell-pcm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 6e5132f

Please sign in to comment.