OSDN Git Service

ASoC: da7213: Fix incorrect usage of bitwise '&' operator for SRM check
authorAdam Thomson <Adam.Thomson.Opensource@diasemi.com>
Wed, 3 May 2017 15:15:53 +0000 (16:15 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 14 May 2017 09:53:37 +0000 (18:53 +0900)
In the SRM lock check section of code the '&' bitwise operator is
used as part of checking lock status. Functionally the code works
as intended, but the conditional statement is a boolean comparison
so should really use '&&' logical operator instead. This commit
rectifies this discrepancy.

Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/da7213.c

index 6dd7578..024d83f 100644 (file)
@@ -772,7 +772,7 @@ static int da7213_dai_event(struct snd_soc_dapm_widget *w,
                                ++i;
                                msleep(50);
                        }
-               } while ((i < DA7213_SRM_CHECK_RETRIES) & (!srm_lock));
+               } while ((i < DA7213_SRM_CHECK_RETRIES) && (!srm_lock));
 
                if (!srm_lock)
                        dev_warn(codec->dev, "SRM failed to lock\n");