Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 09:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: dapm: Delay w->power update until the changes are written

Browse Source 
Wait with updating the widgets power field until the changes are actually
written to the hardware in dapm_seq_run_coalesced(). This will allow us to query
the current hardware state between calling dapm_power_one_widget() and actually
writing the new power state to hardware.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Lars-Peter Clausen 2013-07-29 17:14:03 +02:00 committed by Mark Brown
parent 2553628e19
commit 39eb5fd13d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/soc/soc-dapm.c
View File

@ -293,6 +293,7 @@ static void dapm_reset(struct snd_soc_card *card)
memset(&card->dapm_stats, 0, sizeof(card->dapm_stats));
list_for_each_entry(w, &card->widgets, list) {
w->new_power = w->power;
w->power_checked = false;
w->inputs = -1;
w->outputs = -1;
@ -1340,7 +1341,7 @@ static void dapm_seq_check_event(struct snd_soc_card *card,
return;
}
if (w->power != power)
if (w->new_power != power)
return;
if (w->event && (w->event_flags & event)) {
@ -1369,6 +1370,7 @@ static void dapm_seq_run_coalesced(struct snd_soc_card *card,
list_for_each_entry(w, pending, power_list) {
BUG_ON(reg != w->reg);
w->power = w->new_power;
mask |= w->mask << w->shift;
if (w->power)
@ -1676,8 +1678,6 @@ static void dapm_widget_set_power(struct snd_soc_dapm_widget *w, bool power,
dapm_seq_insert(w, up_list, true);
else
dapm_seq_insert(w, down_list, false);
w->power = power;
}
static void dapm_power_one_widget(struct snd_soc_dapm_widget *w,
@ -1752,7 +1752,7 @@ static int dapm_power_widgets(struct snd_soc_card *card, int event)
break;
}
if (w->power) {
if (w->new_power) {
d = w->dapm;
/* Supplies and micbiases only bring the