diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-06 18:13:23 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-06 20:46:45 (GMT) |
| commit | d4c6005f8e90da10067c35e1182f533582d01a69 (patch) | |
| tree | 7025324b43925d0ddef4f2c0af6410020572bc06 /sound/soc/samsung/speyside.c | |
| parent | 171ec6b0897422099438a9c66546380d0fa2ff44 (diff) | |
| download | linux-d4c6005f8e90da10067c35e1182f533582d01a69.tar.xz | |
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/samsung/speyside.c')
| -rw-r--r-- | sound/soc/samsung/speyside.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/samsung/speyside.c b/sound/soc/samsung/speyside.c index 93078b1..99fb033 100644 --- a/sound/soc/samsung/speyside.c +++ b/sound/soc/samsung/speyside.c @@ -20,11 +20,15 @@ #define WM8915_HPSEL_GPIO 214 static int speyside_set_bias_level(struct snd_soc_card *card, + struct snd_soc_dapm_context *dapm, enum snd_soc_bias_level level) { struct snd_soc_dai *codec_dai = card->rtd[0].codec_dai; int ret; + if (dapm->dev != codec_dai->dev) + return 0; + switch (level) { case SND_SOC_BIAS_STANDBY: ret = snd_soc_dai_set_sysclk(codec_dai, WM8915_SYSCLK_MCLK2, |