diff options
| author | David S. Miller <davem@davemloft.net> | 2011-09-22 11:23:13 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-09-22 11:23:13 +0400 |
| commit | 8decf868790b48a727d7e7ca164f2bcd3c1389c0 (patch) | |
| tree | b759a5f861f842af7ea76f9011b579d06e9d5508 /sound/soc/samsung/speyside_wm8962.c | |
| parent | 3fc72370186be2f9d4d6ef06d99e1caa5d92c564 (diff) | |
| parent | d93dc5c4478c1fd5de85a3e8aece9aad7bbae044 (diff) | |
| download | linux-8decf868790b48a727d7e7ca164f2bcd3c1389c0.tar.xz | |
Merge branch 'master' of github.com:davem330/net
Conflicts:
MAINTAINERS
drivers/net/Kconfig
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
drivers/net/ethernet/broadcom/tg3.c
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/wl12xx/main.c
Diffstat (limited to 'sound/soc/samsung/speyside_wm8962.c')
| -rw-r--r-- | sound/soc/samsung/speyside_wm8962.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/soc/samsung/speyside_wm8962.c b/sound/soc/samsung/speyside_wm8962.c index 8ac42bf82090..72535f2daaf2 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) { @@ -37,7 +40,7 @@ static int speyside_wm8962_set_bias_level(struct snd_soc_card *card, 44100 * 256, SND_SOC_CLOCK_IN); if (ret < 0) { - pr_err("Failed to set SYSCLK: %d\n"); + pr_err("Failed to set SYSCLK: %d\n", ret); return ret; } } @@ -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, |