Commit 61edc9cc authored Feb 28, 2020 by Charles Keepax Committed by Greg Kroah-Hartman Mar 11, 2020

ASoC: dapm: Correct DAPM handling of active widgets during shutdown



commit 9b3193089e77d3b59b045146ff1c770dd899acb1 upstream.

commit c2caa4da ("ASoC: Fix widget powerdown on shutdown") added a
set of the power state during snd_soc_dapm_shutdown to ensure the
widgets powered off. However, when commit 39eb5fd1
("ASoC: dapm: Delay w->power update until the changes are written")
added the new_power member of the widget structure, to differentiate
between the current power state and the target power state, it did not
update the shutdown to use the new_power member.

As new_power has not updated it will be left in the state set by the
last DAPM sequence, ie. 1 for active widgets. So as the DAPM sequence
for the shutdown proceeds it will turn the widgets on (despite them
already being on) rather than turning them off.

Fixes: 39eb5fd1 ("ASoC: dapm: Delay w->power update until the changes are written")
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20200228153145.21013-1-ckeepax@opensource.cirrus.com


Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 8a8a6cf1

sound/soc/soc-dapm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -4551,7 +4551,7 @@ static void soc_dapm_shutdown_dapm(struct snd_soc_dapm_context *dapm)
		continue;
		if (w->power) {
		dapm_seq_insert(w, &down_list, false);
		w->power = 0;
		w->new_power = 0;
		powerdown = 1;
		}
		}