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

Commit 1a7aaa58 authored Nov 23, 2015 by Jeeja KP Committed by Mark Brown Nov 25, 2015

ASoC: core: Change power state before rechecking endpoint



For DAPM resume, we should first change the power state of the
card and then recheck the endpoints. This ensures the dapm is
resumed first and then userspace can resume the streams.

Signed-off-by: Jeeja KP <jeeja.kp@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Reviewed-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent fd589a1b

sound/soc/soc-core.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -795,12 +795,12 @@ static void soc_resume_deferred(struct work_struct *work)

		dev_dbg(card->dev, "ASoC: resume work completed\n");

		/* userspace can access us now we are back as we were before */
		snd_power_change_state(card->snd_card, SNDRV_CTL_POWER_D0);

		/* Recheck all endpoints too, their state is affected by suspend */
		dapm_mark_endpoints_dirty(card);
		snd_soc_dapm_sync(&card->dapm);

		/* userspace can access us now we are back as we were before */
		snd_power_change_state(card->snd_card, SNDRV_CTL_POWER_D0);
		}

		/* powers up audio subsystem after a suspend */