mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-30 10:49:28 +00:00
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: Nicholas Mc Guire <hofrat@osadl.org> Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
c517d838eb
commit
17f4ad601d
1 changed files with 3 additions and 3 deletions
|
@ -1901,7 +1901,7 @@ static int arizona_is_enabled_fll(struct arizona_fll *fll)
|
||||||
static int arizona_enable_fll(struct arizona_fll *fll)
|
static int arizona_enable_fll(struct arizona_fll *fll)
|
||||||
{
|
{
|
||||||
struct arizona *arizona = fll->arizona;
|
struct arizona *arizona = fll->arizona;
|
||||||
int ret;
|
unsigned long time_left;
|
||||||
bool use_sync = false;
|
bool use_sync = false;
|
||||||
int already_enabled = arizona_is_enabled_fll(fll);
|
int already_enabled = arizona_is_enabled_fll(fll);
|
||||||
struct arizona_fll_cfg cfg;
|
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,
|
regmap_update_bits_async(arizona->regmap, fll->base + 1,
|
||||||
ARIZONA_FLL1_FREERUN, 0);
|
ARIZONA_FLL1_FREERUN, 0);
|
||||||
|
|
||||||
ret = wait_for_completion_timeout(&fll->ok,
|
time_left = wait_for_completion_timeout(&fll->ok,
|
||||||
msecs_to_jiffies(250));
|
msecs_to_jiffies(250));
|
||||||
if (ret == 0)
|
if (time_left == 0)
|
||||||
arizona_fll_warn(fll, "Timed out waiting for lock\n");
|
arizona_fll_warn(fll, "Timed out waiting for lock\n");
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue