Message ID | 1425808935-17070-1-git-send-email-hofrat@osadl.org (mailing list archive) |
---|---|
State | Accepted |
Commit | 62c76fe2e580f6a975679e8711bade09e24c204b |
Headers | show |
On Sun, Mar 08, 2015 at 06:02:15AM -0400, Nicholas Mc Guire wrote: > 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> Thanks, Charles
On Sun, Mar 08, 2015 at 06:02:15AM -0400, Nicholas Mc Guire wrote: > 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. Applied both, thanks.
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c index dc92d5e..24d9705 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; }
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> --- This was only compile tested for exynos_defconfig + CONFIG_COMPILE_TEST=y, SND_SOC_ALL_CODECS=m (implies CONFIG_SND_SOC_WM8996=m) Patch is against 4.0-rc2 linux-next (localversion-next is -next-20150306) sound/soc/codecs/wm8996.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)