ASoC: wm8996: match wait_for_completion_timeout return type

return type of wait_for_completion_timeout is unsigned long not int. An
appropriately named unsigned long is added and the assignment fixed up
in case of completion occurring the remaining time is >=1 so ret is set to
1 if no timeout occurred.

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c
index dc92d5e4e9426e8157104361d4a71f675769f00d..7a2b96959589cd321d4f70292206c1de3ba6f044 100644 (file)
--- 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? */
@@ -2113,10 +2113,11 @@ static int wm8996_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
                timeout /= 2;
 
        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;
                }