diff options
author | Nicholas Mc Guire <hofrat@osadl.org> | 2015-03-08 07:06:05 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-03-09 14:18:34 -0400 |
commit | 78bb997ace926451ec8d1ed15178b161dc61b805 (patch) | |
tree | 3b2752519edff6c2724672c4f8efca8f10475c38 /sound | |
parent | c517d838eb7d07bbe9507871fab3931deccff539 (diff) |
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.c | 8 |
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, | |||
1942 | struct wm2200_priv *wm2200 = snd_soc_codec_get_drvdata(codec); | 1942 | struct wm2200_priv *wm2200 = snd_soc_codec_get_drvdata(codec); |
1943 | struct _fll_div factors; | 1943 | struct _fll_div factors; |
1944 | int ret, i, timeout; | 1944 | int ret, i, timeout; |
1945 | unsigned long time_left; | ||
1945 | 1946 | ||
1946 | if (!Fout) { | 1947 | if (!Fout) { |
1947 | dev_dbg(codec->dev, "FLL disabled"); | 1948 | 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, | |||
2021 | /* Poll for the lock; will use the interrupt to exit quickly */ | 2022 | /* Poll for the lock; will use the interrupt to exit quickly */ |
2022 | for (i = 0; i < timeout; i++) { | 2023 | for (i = 0; i < timeout; i++) { |
2023 | if (i2c->irq) { | 2024 | if (i2c->irq) { |
2024 | ret = wait_for_completion_timeout(&wm2200->fll_lock, | 2025 | time_left = wait_for_completion_timeout( |
2025 | msecs_to_jiffies(25)); | 2026 | &wm2200->fll_lock, |
2026 | if (ret > 0) | 2027 | msecs_to_jiffies(25)); |
2028 | if (time_left > 0) | ||
2027 | break; | 2029 | break; |
2028 | } else { | 2030 | } else { |
2029 | msleep(1); | 2031 | msleep(1); |