ASoC: wm2200: match wait_for_completion_timeout return type
authorNicholas Mc Guire <hofrat@osadl.org>
Sun, 8 Mar 2015 11:06:05 +0000 (07:06 -0400)
committerMark Brown <broonie@kernel.org>
Mon, 9 Mar 2015 18:18:34 +0000 (18:18 +0000)
return type of wait_for_completion_timeout is unsigned long not int. An
appropriately named unsigned long is added and the assignment fixed up.

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/wm2200.c

index 1559984..b48694a 100644 (file)
@@ -1942,6 +1942,7 @@ static int wm2200_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
        struct wm2200_priv *wm2200 = snd_soc_codec_get_drvdata(codec);
        struct _fll_div factors;
        int ret, i, timeout;
+       unsigned long time_left;
 
        if (!Fout) {
                dev_dbg(codec->dev, "FLL disabled");
@@ -2021,9 +2022,10 @@ static int wm2200_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
        /* Poll for the lock; will use the interrupt to exit quickly */
        for (i = 0; i < timeout; i++) {
                if (i2c->irq) {
-                       ret = wait_for_completion_timeout(&wm2200->fll_lock,
-                                                         msecs_to_jiffies(25));
-                       if (ret > 0)
+                       time_left = wait_for_completion_timeout(
+                                                       &wm2200->fll_lock,
+                                                       msecs_to_jiffies(25));
+                       if (time_left > 0)
                                break;
                } else {
                        msleep(1);