| From 23d82662808ee6338958e4ffc3e48621c8e450de Mon Sep 17 00:00:00 2001 |
| From: Charles Keepax <ckeepax@opensource.cirrus.com> |
| Date: Fri, 28 Feb 2020 15:31:45 +0000 |
| Subject: [PATCH] ASoC: dapm: Correct DAPM handling of active widgets during |
| shutdown |
| |
| commit 9b3193089e77d3b59b045146ff1c770dd899acb1 upstream. |
| |
| 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> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c |
| index f40adb604c25..da85742a3a89 100644 |
| --- a/sound/soc/soc-dapm.c |
| +++ b/sound/soc/soc-dapm.c |
| @@ -4680,7 +4680,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; |
| } |
| } |
| -- |
| 2.7.4 |
| |
