diff options
| author | Nicholas Mc Guire <hofrat@osadl.org> | 2015-03-08 09:16:49 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-09 18:18:07 +0000 |
| commit | 17f4ad601d2753be7f15cd2928e89309759e4936 (patch) | |
| tree | 837e011881378f85dd95415a31a8ea2570276f11 /sound/soc/codecs/arizona.c | |
| parent | c517d838eb7d07bbe9507871fab3931deccff539 (diff) | |
| download | op-kernel-dev-17f4ad601d2753be7f15cd2928e89309759e4936.zip op-kernel-dev-17f4ad601d2753be7f15cd2928e89309759e4936.tar.gz | |
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>
Diffstat (limited to 'sound/soc/codecs/arizona.c')
| -rw-r--r-- | sound/soc/codecs/arizona.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c index 2920261..9015b44 100644 --- a/sound/soc/codecs/arizona.c +++ b/sound/soc/codecs/arizona.c @@ -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; |
