From 6d7ec234fe361e8f077b882136c05b96acfa7a56 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Mon, 27 Sep 2010 17:20:11 -0700 Subject: [PATCH] --- yaml --- r: 216589 b: refs/heads/master c: 61371126307ffabb9880e5a22e126b46df846b12 h: refs/heads/master i: 216587: 274ef82df29b21c49b09e5c2d121bc66c8abd2ab v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8962.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 100e8281906e..2d429a2a069f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1454e6fbdf01056834018cfd12f9a066cfc0dd7 +refs/heads/master: 61371126307ffabb9880e5a22e126b46df846b12 diff --git a/trunk/sound/soc/codecs/wm8962.c b/trunk/sound/soc/codecs/wm8962.c index 7de519479801..12286d6c708d 100644 --- a/trunk/sound/soc/codecs/wm8962.c +++ b/trunk/sound/soc/codecs/wm8962.c @@ -1342,7 +1342,7 @@ static int wm8962_set_fll(struct snd_soc_dai *dai, int fll_id, int source, struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec); struct _fll_div fll_div; int ret; - int fll1 = snd_soc_read(codec, WM8962_FLL_CONTROL_1); + int fll1 = snd_soc_read(codec, WM8962_FLL_CONTROL_1) & WM8962_FLL_ENA; /* Any change? */ if (source == wm8962->fll_src && Fref == wm8962->fll_fref &&