Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

sound/soc/codecs/wm5100.c

+4 −3
Original line number Diff line number Diff line
@@ -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,

			time_left = wait_for_completion_timeout(&fll->lock,

							msecs_to_jiffies(25));

			if (ret > 0)

			if (time_left > 0)

				break;

		} else {

			msleep(1);