lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-3.0' into for-3.1

Browse Source
This commit is contained in:
Mark Brown
2011-06-06 12:47:06 +01:00
parent aa72f6899b 6ac340623c
commit 84abd1b395
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sound/soc/codecs/wm8915.c
View File

@@ -1835,7 +1835,7 @@ static int wm8915_set_sysclk(struct snd_soc_dai *dai,
int old; int old;
/* Disable SYSCLK while we reconfigure */ /* 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, snd_soc_update_bits(codec, WM8915_AIF_CLOCKING_1,
WM8915_SYSCLK_ENA, 0); WM8915_SYSCLK_ENA, 0);
@@ -2034,6 +2034,7 @@ static int wm8915_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
break; break;
case WM8915_FLL_MCLK2: case WM8915_FLL_MCLK2:
reg = 1; reg = 1;
break;
case WM8915_FLL_DACLRCLK1: case WM8915_FLL_DACLRCLK1:
reg = 2; reg = 2;
break; break;