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 14:18:07 -0400 |
commit | 17f4ad601d2753be7f15cd2928e89309759e4936 (patch) | |
tree | 837e011881378f85dd95415a31a8ea2570276f11 | |
parent | c517d838eb7d07bbe9507871fab3931deccff539 (diff) |
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>
-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 29202610dd0d..9015b44a9e11 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) | |||
1901 | static int arizona_enable_fll(struct arizona_fll *fll) | 1901 | static int arizona_enable_fll(struct arizona_fll *fll) |
1902 | { | 1902 | { |
1903 | struct arizona *arizona = fll->arizona; | 1903 | struct arizona *arizona = fll->arizona; |
1904 | int ret; | 1904 | unsigned long time_left; |
1905 | bool use_sync = false; | 1905 | bool use_sync = false; |
1906 | int already_enabled = arizona_is_enabled_fll(fll); | 1906 | int already_enabled = arizona_is_enabled_fll(fll); |
1907 | struct arizona_fll_cfg cfg; | 1907 | struct arizona_fll_cfg cfg; |
@@ -1977,9 +1977,9 @@ static int arizona_enable_fll(struct arizona_fll *fll) | |||
1977 | regmap_update_bits_async(arizona->regmap, fll->base + 1, | 1977 | regmap_update_bits_async(arizona->regmap, fll->base + 1, |
1978 | ARIZONA_FLL1_FREERUN, 0); | 1978 | ARIZONA_FLL1_FREERUN, 0); |
1979 | 1979 | ||
1980 | ret = wait_for_completion_timeout(&fll->ok, | 1980 | time_left = wait_for_completion_timeout(&fll->ok, |
1981 | msecs_to_jiffies(250)); | 1981 | msecs_to_jiffies(250)); |
1982 | if (ret == 0) | 1982 | if (time_left == 0) |
1983 | arizona_fll_warn(fll, "Timed out waiting for lock\n"); | 1983 | arizona_fll_warn(fll, "Timed out waiting for lock\n"); |
1984 | 1984 | ||
1985 | return 0; | 1985 | return 0; |