From 207e6431971ac621a418e6704afb74c36d68b515 Mon Sep 17 00:00:00 2001
From: Kyung-Kwee Ryu <Kyung-Kwee.Ryu@wolfsonmicro.com>
Date: Tue, 24 Apr 2012 18:01:48 +0100
Subject: [PATCH] --- yaml --- r: 305655 b: refs/heads/master c:
 e05854ddaa012f3369884acf61ec9953285404b4 h: refs/heads/master i:   305653:
 7ce04382b66481c12a77ed3a2f778c0f931fae1b   305651:
 a75c13ca8a733b3c1fc78aea3aa724135b0bdbf0   305647:
 8d4e7d6c58f33137b45aa8c08b8b187bd59fda1f v: v3

---
 [refs]                          | 2 +-
 trunk/sound/soc/codecs/wm8994.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ffd6627cef52..2ddeb67c3078 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd7b10b30c40dddb9750926d78cfe89c0cd8434d
+refs/heads/master: e05854ddaa012f3369884acf61ec9953285404b4
diff --git a/trunk/sound/soc/codecs/wm8994.c b/trunk/sound/soc/codecs/wm8994.c
index 4cebac4f6215..746d3db6f19f 100644
--- a/trunk/sound/soc/codecs/wm8994.c
+++ b/trunk/sound/soc/codecs/wm8994.c
@@ -1982,7 +1982,7 @@ static int _wm8994_set_fll(struct snd_soc_codec *codec, int id, int src,
 			    WM8994_FLL1_ENA, 0);
 
 	if (wm8994->fll_byp && src == WM8994_FLL_SRC_BCLK &&
-	    freq_in == freq_out) {
+	    freq_in == freq_out && freq_out) {
 		dev_dbg(codec->dev, "Bypassing FLL%d\n", id + 1);
 		snd_soc_update_bits(codec, WM8994_FLL1_CONTROL_5 + reg_offset,
 				    WM8958_FLL1_BYP, WM8958_FLL1_BYP);