diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-22 13:00:08 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-22 13:00:08 (GMT) |
| commit | fef24d92a649ba1415c0a834259048153a2ab30a (patch) | |
| tree | 6530bae4e72ce16de600fee8e9f602fa96f9be2b /sound/soc/samsung | |
| parent | fbf04076ef9b704ab27dbd1b2f97569227775bb4 (diff) | |
| parent | a41619455c0e28b6973471e87f1702c6129d3439 (diff) | |
| download | linux-fef24d92a649ba1415c0a834259048153a2ab30a.tar.xz | |
Merge branch 'for-3.1' into for-3.2
Diffstat (limited to 'sound/soc/samsung')
| -rw-r--r-- | sound/soc/samsung/speyside_wm8962.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/samsung/speyside_wm8962.c b/sound/soc/samsung/speyside_wm8962.c index 753e1c2..3820a6b 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, |