Merge branch 'for-3.1' into for-3.2

1 files changed, 6 insertions, 0 deletions

diff --git a/sound/soc/samsung/speyside_wm8962.c b/sound/soc/samsung/speyside_wm8962.c
index 753e1c2702b0..3820a6b057dc 100644
--- a/sound/soc/samsung/speyside_wm8962.c
+++ b/sound/soc/samsung/speyside_wm8962.c
@@ -23,6 +23,9 @@ static int speyside_wm8962_set_bias_level(struct snd_soc_card *card,
         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_PREPARE:
                 if (dapm->bias_level == SND_SOC_BIAS_STANDBY) {
@@ -57,6 +60,9 @@ static int speyside_wm8962_set_bias_level_post(struct snd_soc_card *card,
         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, WM8962_SYSCLK_MCLK,