diff options
| author | Nicholas Mc Guire <hofrat@osadl.org> | 2015-03-08 06:02:15 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-09 18:15:44 +0000 |
| commit | 62c76fe2e580f6a975679e8711bade09e24c204b (patch) | |
| tree | ad949e701201b4c8ad4754c969ec9e00a22aeab3 | |
| parent | c517d838eb7d07bbe9507871fab3931deccff539 (diff) | |
| download | linux-62c76fe2e580f6a975679e8711bade09e24c204b.tar.gz linux-62c76fe2e580f6a975679e8711bade09e24c204b.tar.bz2 linux-62c76fe2e580f6a975679e8711bade09e24c204b.zip | |
ASoC: wm8996: 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
in case of completion occurring the remaining time is >=1 so ret is set to
1 if no timeout occurred.
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/wm8996.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c index dc92d5e4e942..7a2b96959589 100644 --- a/sound/soc/codecs/wm8996.c +++ b/sound/soc/codecs/wm8996.c @@ -2009,7 +2009,7 @@ static int wm8996_set_fll(struct snd_soc_codec *codec, int fll_id, int source, struct wm8996_priv *wm8996 = snd_soc_codec_get_drvdata(codec); struct i2c_client *i2c = to_i2c_client(codec->dev); struct _fll_div fll_div; - unsigned long timeout; + unsigned long timeout, time_left; int ret, reg, retry; /* Any change? */ @@ -2113,10 +2113,11 @@ static int wm8996_set_fll(struct snd_soc_codec *codec, int fll_id, int source, timeout /= 2; for (retry = 0; retry < 10; retry++) { - ret = wait_for_completion_timeout(&wm8996->fll_lock, - timeout); - if (ret != 0) { + time_left = wait_for_completion_timeout(&wm8996->fll_lock, + timeout); + if (time_left != 0) { WARN_ON(!i2c->irq); + ret = 1; break; } |