| From foo@baz Fri Mar 16 15:43:17 CET 2018 |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| Date: Sat, 9 Dec 2017 14:52:28 +0300 |
| Subject: ASoC: nuc900: Fix a loop timeout test |
| |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| |
| |
| [ Upstream commit 65a12b3aafed5fc59f4ce41b22b752b1729e6701 ] |
| |
| We should be finishing the loop with timeout set to zero but because |
| this is a post-op we finish with timeout == -1. |
| |
| Fixes: 1082e2703a2d ("ASoC: NUC900/audio: add nuc900 audio driver support") |
| Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| sound/soc/nuc900/nuc900-ac97.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/sound/soc/nuc900/nuc900-ac97.c |
| +++ b/sound/soc/nuc900/nuc900-ac97.c |
| @@ -67,7 +67,7 @@ static unsigned short nuc900_ac97_read(s |
| |
| /* polling the AC_R_FINISH */ |
| while (!(AUDIO_READ(nuc900_audio->mmio + ACTL_ACCON) & AC_R_FINISH) |
| - && timeout--) |
| + && --timeout) |
| mdelay(1); |
| |
| if (!timeout) { |
| @@ -121,7 +121,7 @@ static void nuc900_ac97_write(struct snd |
| |
| /* polling the AC_W_FINISH */ |
| while ((AUDIO_READ(nuc900_audio->mmio + ACTL_ACCON) & AC_W_FINISH) |
| - && timeout--) |
| + && --timeout) |
| mdelay(1); |
| |
| if (!timeout) |