summaryrefslogtreecommitdiff
path: root/sound/soc/atmel
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/atmel
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/atmel')
-rw-r--r--sound/soc/atmel/sam9g20_wm8731.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c
index 95572d290c2..bad3aa14d5b 100644
--- a/sound/soc/atmel/sam9g20_wm8731.c
+++ b/sound/soc/atmel/sam9g20_wm8731.c
@@ -92,6 +92,7 @@ static struct snd_soc_ops at91sam9g20ek_ops = {
};
static int at91sam9g20ek_set_bias_level(struct snd_soc_card *card,
+ struct snd_soc_dapm_context *dapm,
enum snd_soc_bias_level level)
{
static int mclk_on;