Commit 905a8086 authored by Nicholas Mc Guire's avatar Nicholas Mc Guire Committed by Mark Brown

ASoC: wm5100: 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: default avatarNicholas Mc Guire <hofrat@osadl.org>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c517d838
...@@ -1762,6 +1762,7 @@ static int wm5100_set_fll(struct snd_soc_codec *codec, int fll_id, int source, ...@@ -1762,6 +1762,7 @@ static int wm5100_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
struct _fll_div factors; struct _fll_div factors;
struct wm5100_fll *fll; struct wm5100_fll *fll;
int ret, base, lock, i, timeout; int ret, base, lock, i, timeout;
unsigned long time_left;
switch (fll_id) { switch (fll_id) {
case WM5100_FLL1: case WM5100_FLL1:
...@@ -1842,9 +1843,9 @@ static int wm5100_set_fll(struct snd_soc_codec *codec, int fll_id, int source, ...@@ -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 */ /* Poll for the lock; will use interrupt when we can test */
for (i = 0; i < timeout; i++) { for (i = 0; i < timeout; i++) {
if (i2c->irq) { if (i2c->irq) {
ret = wait_for_completion_timeout(&fll->lock, time_left = wait_for_completion_timeout(&fll->lock,
msecs_to_jiffies(25)); msecs_to_jiffies(25));
if (ret > 0) if (time_left > 0)
break; break;
} else { } else {
msleep(1); msleep(1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment