diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-06 12:47:06 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-06 12:47:06 +0100 |
| commit | 84abd1b395cf41269ffb5605a6ece3d6d7f8a3e1 (patch) | |
| tree | 78cf08595c7175669ef6d20c686ab43a49ea8090 /sound/soc/codecs/wm8915.c | |
| parent | aa72f6899b9fb3dc824c458234ae3507a60e462d (diff) | |
| parent | 6ac340623c5d2a945030814d900701439772ff57 (diff) | |
| download | lwn-84abd1b395cf41269ffb5605a6ece3d6d7f8a3e1.tar.gz lwn-84abd1b395cf41269ffb5605a6ece3d6d7f8a3e1.zip | |
Merge branch 'for-3.0' into for-3.1
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 5a59ef73e702..b654fcd14897 100644 --- a/sound/soc/codecs/wm8915.c +++ b/sound/soc/codecs/wm8915.c @@ -1835,7 +1835,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); @@ -2034,6 +2034,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; |