]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ASoC: wm5100: match wait_for_completion_timeout return type
authorNicholas Mc Guire <hofrat@osadl.org>
Sun, 8 Mar 2015 10:57:07 +0000 (06:57 -0400)
committerMark Brown <broonie@kernel.org>
Mon, 9 Mar 2015 18:18:13 +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>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/wm5100.c

index ea09db585aa1fd266f391aadbde5fa78c71318db..96740379b711bf2d5816666772fabf92e85124d9 100644 (file)
@@ -1762,6 +1762,7 @@ static int wm5100_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
        struct _fll_div factors;
        struct wm5100_fll *fll;
        int ret, base, lock, i, timeout;
+       unsigned long time_left;
 
        switch (fll_id) {
        case WM5100_FLL1:
@@ -1842,9 +1843,9 @@ static int wm5100_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
        /* Poll for the lock; will use interrupt when we can test */
        for (i = 0; i < timeout; i++) {
                if (i2c->irq) {
-                       ret = wait_for_completion_timeout(&fll->lock,
-                                                         msecs_to_jiffies(25));
-                       if (ret > 0)
+                       time_left = wait_for_completion_timeout(&fll->lock,
+                                                       msecs_to_jiffies(25));
+                       if (time_left > 0)
                                break;
                } else {
                        msleep(1);