summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-dapm.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2020-03-02 15:39:08 +0100
committerMark Brown <broonie@kernel.org>2020-03-02 15:39:08 +0100
commitcd1fa30142e2fc24ae81448f420197712d49d526 (patch)
treecb8769c06c9e657814946707046a17914fe5a663 /sound/soc/soc-dapm.c
parentMerge series "ASoC: SOF: updates for 5.7" from Pierre-Louis Bossart <pierre-l... (diff)
parentASoC: rt1015: add operation callback function for rt1015_dai[] (diff)
downloadlinux-cd1fa30142e2fc24ae81448f420197712d49d526.tar.xz
linux-cd1fa30142e2fc24ae81448f420197712d49d526.zip
Merge branch 'for-5.6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.7
Diffstat (limited to 'sound/soc/soc-dapm.c')
-rw-r--r--sound/soc/soc-dapm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 9a809f2caa10..09fa437fc33e 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -4794,7 +4794,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;
}
}