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

Commit 17f4ad60 authored by Nicholas Mc Guire's avatar Nicholas Mc Guire Committed by Mark Brown
Browse files

ASoC: arizona: 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/arizona.c

+3 −3
Original line number Diff line number Diff line
@@ -1901,7 +1901,7 @@ static int arizona_is_enabled_fll(struct arizona_fll *fll) 
static int arizona_enable_fll(struct arizona_fll *fll)

{

	struct arizona *arizona = fll->arizona;

	int ret;

	unsigned long time_left;

	bool use_sync = false;

	int already_enabled = arizona_is_enabled_fll(fll);

	struct arizona_fll_cfg cfg;
@@ -1977,9 +1977,9 @@ static int arizona_enable_fll(struct arizona_fll *fll) 
		regmap_update_bits_async(arizona->regmap, fll->base + 1,

					 ARIZONA_FLL1_FREERUN, 0);



	ret = wait_for_completion_timeout(&fll->ok,

	time_left = wait_for_completion_timeout(&fll->ok,

					  msecs_to_jiffies(250));

	if (ret == 0)

	if (time_left == 0)

		arizona_fll_warn(fll, "Timed out waiting for lock\n");



	return 0;