Skip to content

Commit

Permalink
ASoC: dapm: Don't force card bias level to be updated
Browse files Browse the repository at this point in the history
Commit 412312 (ASoC: dapm: Make sure all dapm contexts are updated) means
that any DAPM context being updated will have the bias level automatically
set, including the card. We can't safely do this as the card callbacks are
called for each device context and so the management of the card bias is
more complex. Several multi-component cards rely on this behaviour.

Skip updates during the asynchronous run entirely. We should really do them
in the synchronous section but it's not 100% clear which values to pick as
the different DAPM contexts may have different bias levels.

Signed-off-by: Mark Brown <[email protected]>
  • Loading branch information
broonie committed Aug 25, 2012
1 parent d8c3bb9 commit 4e872a4
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion sound/soc/soc-dapm.c
Original file line number Diff line number Diff line change
Expand Up @@ -293,8 +293,9 @@ static int snd_soc_dapm_set_bias_level(struct snd_soc_dapm_context *dapm,
level);
else
dapm->bias_level = level;
} else
} else if (!card || dapm != &card->dapm) {
dapm->bias_level = level;
}

if (ret != 0)
goto out;
Expand Down

0 comments on commit 4e872a4

Please sign in to comment.