diff options
| author | guoyin.chen <guoyin.chen@freescale.com> | 2013-07-25 12:51:11 +0800 |
|---|---|---|
| committer | guoyin.chen <guoyin.chen@freescale.com> | 2013-07-25 12:51:11 +0800 |
| commit | e0ed8f9615984df78cd5443727e7657983a6f6b0 (patch) | |
| tree | 3df10cef101c1d88213433c46f71014f606e4fdd /sound | |
| parent | 8ae3cff80f21bb078fcef63520a98f2d73e7359a (diff) | |
| parent | 781e4301e0c4d7a86a198c867164c13ad727837e (diff) | |
Merge remote-tracking branch 'fsl-linux-sdk/imx_3.0.35_4.1.0' into imx_3.0.35_android
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm8962.c | 2 | ||||
| -rw-r--r-- | sound/soc/soc-core.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index b370349c0a8f..b54ddb751adb 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -4111,7 +4111,7 @@ static int wm8962_probe(struct snd_soc_codec *codec) WM8962_INR_VOL_MASK, 0x3f); snd_soc_update_bits(codec, WM8962_LEFT_ADC_VOLUME, WM8962_ADCL_VOL_MASK, 0xd8); - snd_soc_update_bits(codec, WM8962_LEFT_ADC_VOLUME, + snd_soc_update_bits(codec, WM8962_RIGHT_ADC_VOLUME, WM8962_ADCR_VOL_MASK, 0xd8); snd_soc_update_bits(codec, WM8962_RIGHT_INPUT_MIXER_VOLUME, WM8962_IN3R_MIXINR_VOL_MASK, 0x7); diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index e62ad5ffce66..b3ab124652be 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -748,6 +748,9 @@ static int soc_codec_close(struct snd_pcm_substream *substream) codec_dai->active--; codec->active--; + if (!cpu_dai->active && !codec_dai->active) + rtd->rate = 0; + /* Muting the DAC suppresses artifacts caused during digital * shutdown, for example from stopping clocks. */ |