summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorNicholas Mc Guire <hofrat@osadl.org>2015-03-08 07:06:05 -0400
committerMark Brown <broonie@kernel.org>2015-03-09 18:18:34 +0000
commit78bb997ace926451ec8d1ed15178b161dc61b805 (patch)
tree3b2752519edff6c2724672c4f8efca8f10475c38 /sound
parentc517d838eb7d07bbe9507871fab3931deccff539 (diff)
downloadlinux-78bb997ace926451ec8d1ed15178b161dc61b805.tar.gz
linux-78bb997ace926451ec8d1ed15178b161dc61b805.tar.bz2
linux-78bb997ace926451ec8d1ed15178b161dc61b805.zip
ASoC: wm2200: 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. Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm2200.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c
index 15599845a660..b48694a8d213 100644
--- a/sound/soc/codecs/wm2200.c
+++ b/sound/soc/codecs/wm2200.c
@@ -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);