summaryrefslogtreecommitdiff
path: root/sound/soc/soc-dapm.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-06-06 19:13:23 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-06-06 21:46:45 +0100
commitd4c6005f8e90da10067c35e1182f533582d01a69 (patch)
tree7025324b43925d0ddef4f2c0af6410020572bc06 /sound/soc/soc-dapm.c
parent171ec6b0897422099438a9c66546380d0fa2ff44 (diff)
downloadlinux-3.10-d4c6005f8e90da10067c35e1182f533582d01a69.tar.gz
linux-3.10-d4c6005f8e90da10067c35e1182f533582d01a69.tar.bz2
linux-3.10-d4c6005f8e90da10067c35e1182f533582d01a69.zip
ASoC: Add context parameter to card DAPM callbacks
The card callback will get called for each DAPM context in the card so it can be useful for it to know which device is currently undergoing a transition. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound/soc/soc-dapm.c')
-rw-r--r--sound/soc/soc-dapm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index d989dd71e3a..1682834f8c3 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -142,7 +142,7 @@ static int snd_soc_dapm_set_bias_level(struct snd_soc_dapm_context *dapm,
trace_snd_soc_bias_level_start(card, level);
if (card && card->set_bias_level)
- ret = card->set_bias_level(card, level);
+ ret = card->set_bias_level(card, dapm, level);
if (ret != 0)
goto out;
@@ -154,7 +154,7 @@ static int snd_soc_dapm_set_bias_level(struct snd_soc_dapm_context *dapm,
goto out;
if (card && card->set_bias_level_post)
- ret = card->set_bias_level_post(card, level);
+ ret = card->set_bias_level_post(card, dapm, level);
out:
trace_snd_soc_bias_level_done(card, level);