lkml.org 
[lkml]   [2018]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.4 112/115] ASoC: nuc900: Fix a loop timeout test
    Date
    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>
    ---
    sound/soc/nuc900/nuc900-ac97.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/sound/soc/nuc900/nuc900-ac97.c b/sound/soc/nuc900/nuc900-ac97.c
    index b6615affe571..fde974d52bb2 100644
    --- a/sound/soc/nuc900/nuc900-ac97.c
    +++ b/sound/soc/nuc900/nuc900-ac97.c
    @@ -67,7 +67,7 @@ static unsigned short nuc900_ac97_read(struct snd_ac97 *ac97,

    /* 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_ac97 *ac97, unsigned short reg,

    /* polling the AC_W_FINISH */
    while ((AUDIO_READ(nuc900_audio->mmio + ACTL_ACCON) & AC_W_FINISH)
    - && timeout--)
    + && --timeout)
    mdelay(1);

    if (!timeout)
    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-03 23:58    [W:8.760 / U:26.928 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site