aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-dapm.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-06-06 14:13:23 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-06-06 16:46:45 -0400
commitd4c6005f8e90da10067c35e1182f533582d01a69 (patch)
tree7025324b43925d0ddef4f2c0af6410020572bc06 /sound/soc/soc-dapm.c
parent171ec6b0897422099438a9c66546380d0fa2ff44 (diff)
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 d989dd71e3ac..1682834f8c38 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,
142 trace_snd_soc_bias_level_start(card, level); 142 trace_snd_soc_bias_level_start(card, level);
143 143
144 if (card && card->set_bias_level) 144 if (card && card->set_bias_level)
145 ret = card->set_bias_level(card, level); 145 ret = card->set_bias_level(card, dapm, level);
146 if (ret != 0) 146 if (ret != 0)
147 goto out; 147 goto out;
148 148
@@ -154,7 +154,7 @@ static int snd_soc_dapm_set_bias_level(struct snd_soc_dapm_context *dapm,
154 goto out; 154 goto out;
155 155
156 if (card && card->set_bias_level_post) 156 if (card && card->set_bias_level_post)
157 ret = card->set_bias_level_post(card, level); 157 ret = card->set_bias_level_post(card, dapm, level);
158out: 158out:
159 trace_snd_soc_bias_level_done(card, level); 159 trace_snd_soc_bias_level_done(card, level);
160 160