1 files changed, 7 insertions, 5 deletions

diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c
index dc92d5e4e942..308748a022c5 100644
--- a/sound/soc/codecs/wm8996.c
+++ b/sound/soc/codecs/wm8996.c
@@ -2009,7 +2009,7 @@ static int wm8996_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
         struct wm8996_priv *wm8996 = snd_soc_codec_get_drvdata(codec);
         struct i2c_client *i2c = to_i2c_client(codec->dev);
         struct _fll_div fll_div;
-        unsigned long timeout;
+        unsigned long timeout, time_left;
         int ret, reg, retry;
 
         /* Any change? */
@@ -2110,13 +2110,15 @@ static int wm8996_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
         if (i2c->irq)
                 timeout *= 10;
         else
-                timeout /= 2;
+                /* ensure timeout of atleast 1 jiffies */
+                timeout = timeout/2 ? : 1;
 
         for (retry = 0; retry < 10; retry++) {
-                ret = wait_for_completion_timeout(&wm8996->fll_lock,
-                                                  timeout);
-                if (ret != 0) {
+                time_left = wait_for_completion_timeout(&wm8996->fll_lock,
+                                                        timeout);
+                if (time_left != 0) {
                         WARN_ON(!i2c->irq);
+                        ret = 1;
                         break;
                 }