summaryrefslogtreecommitdiffstats
path: root/sound/soc/samsung
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/samsung
parent171ec6b0897422099438a9c66546380d0fa2ff44 (diff)
downloadblackbird-op-linux-d4c6005f8e90da10067c35e1182f533582d01a69.tar.gz
blackbird-op-linux-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/samsung')
-rw-r--r--sound/soc/samsung/speyside.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/samsung/speyside.c b/sound/soc/samsung/speyside.c
index 93078b15a8f9..99fb0337ba5d 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,
OpenPOWER on IntegriCloud