diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-06-10 17:49:34 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-06-10 17:49:34 +0200 |
| commit | 05e205429d3f73ad4f9f0d84e8a95e978237d6fd (patch) | |
| tree | 558ded377d3deafcc8397b72ae6f696cdc55a713 /sound/soc/codecs/wm8915.c | |
| parent | ALSA: hda: Fix inaudible internal speakers on CyberpowerPC Gamer Xplorer N570... (diff) | |
| parent | ASoC: SAMSUNG: Fix the incorrect referencing of I2SCON register (diff) | |
| download | linux-05e205429d3f73ad4f9f0d84e8a95e978237d6fd.tar.xz linux-05e205429d3f73ad4f9f0d84e8a95e978237d6fd.zip | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/codecs/wm8915.c')
| -rw-r--r-- | sound/soc/codecs/wm8915.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8915.c b/sound/soc/codecs/wm8915.c index a0b1a7278284..e2ab4fac2819 100644 --- a/sound/soc/codecs/wm8915.c +++ b/sound/soc/codecs/wm8915.c @@ -1839,7 +1839,7 @@ static int wm8915_set_sysclk(struct snd_soc_dai *dai, int old; /* Disable SYSCLK while we reconfigure */ - old = snd_soc_read(codec, WM8915_AIF_CLOCKING_1); + old = snd_soc_read(codec, WM8915_AIF_CLOCKING_1) & WM8915_SYSCLK_ENA; snd_soc_update_bits(codec, WM8915_AIF_CLOCKING_1, WM8915_SYSCLK_ENA, 0); @@ -2038,6 +2038,7 @@ static int wm8915_set_fll(struct snd_soc_codec *codec, int fll_id, int source, break; case WM8915_FLL_MCLK2: reg = 1; + break; case WM8915_FLL_DACLRCLK1: reg = 2; break; |