Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 12:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: wm2200: match wait_for_completion_timeout return type

Browse Source 
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>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Nicholas Mc Guire 2015-03-08 07:06:05 -04:00 committed by Mark Brown
parent c517d838eb
commit 78bb997ace
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/soc/codecs/wm2200.c
View File

@ -1942,6 +1942,7 @@ static int wm2200_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
struct wm2200_priv *wm2200 = snd_soc_codec_get_drvdata(codec); struct wm2200_priv *wm2200 = snd_soc_codec_get_drvdata(codec);
struct _fll_div factors; struct _fll_div factors;
int ret, i, timeout; int ret, i, timeout;
unsigned long time_left;
if (!Fout) { if (!Fout) {
dev_dbg(codec->dev, "FLL disabled"); dev_dbg(codec->dev, "FLL disabled");
@ -2021,9 +2022,10 @@ static int wm2200_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
/* Poll for the lock; will use the interrupt to exit quickly */ /* Poll for the lock; will use the interrupt to exit quickly */
for (i = 0; i < timeout; i++) { for (i = 0; i < timeout; i++) {
if (i2c->irq) { if (i2c->irq) {
ret = wait_for_completion_timeout(&wm2200->fll_lock, time_left = wait_for_completion_timeout(
msecs_to_jiffies(25)); &wm2200->fll_lock,
if (ret > 0) msecs_to_jiffies(25));
if (time_left > 0)
break; break;
} else { } else {
msleep(1); msleep(1);