diff options
| author | Charles Keepax <ckeepax@opensource.cirrus.com> | 2020-02-28 15:31:45 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-02-28 17:06:08 +0000 |
| commit | 9b3193089e77d3b59b045146ff1c770dd899acb1 (patch) | |
| tree | f76cf01772c68286a9bc39f73a3e312357601da8 /sound | |
| parent | 38b6a714941a285319734b9ccc30d34e107d5d7e (diff) | |
| download | linux-rpi-9b3193089e77d3b59b045146ff1c770dd899acb1.tar.gz linux-rpi-9b3193089e77d3b59b045146ff1c770dd899acb1.tar.bz2 linux-rpi-9b3193089e77d3b59b045146ff1c770dd899acb1.zip | |
ASoC: dapm: Correct DAPM handling of active widgets during shutdown
commit c2caa4da46a4 ("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 39eb5fd13dff
("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: 39eb5fd13dff ("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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-dapm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 9b130561d562..9fb54e6fe254 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -4772,7 +4772,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; } } |