Skip to content

Commit 9b31930

Browse files
charleskeepaxbroonie
authored andcommitted
ASoC: dapm: Correct DAPM handling of active widgets during shutdown
commit c2caa4d ("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 39eb5fd ("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: 39eb5fd ("ASoC: dapm: Delay w->power update until the changes are written") Signed-off-by: Charles Keepax <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 38b6a71 commit 9b31930

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

sound/soc/soc-dapm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4772,7 +4772,7 @@ static void soc_dapm_shutdown_dapm(struct snd_soc_dapm_context *dapm)
47724772
continue;
47734773
if (w->power) {
47744774
dapm_seq_insert(w, &down_list, false);
4775-
w->power = 0;
4775+
w->new_power = 0;
47764776
powerdown = 1;
47774777
}
47784778
}

0 commit comments

Comments
 (0)