From: Adam Thomson Date: Wed, 3 May 2017 15:15:53 +0000 (+0100) Subject: ASoC: da7213: Fix incorrect usage of bitwise '&' operator for SRM check X-Git-Tag: MMI-PSA29.97-13-9~4589^2~60^2~2^4~1 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=14f814fbedd749992476bb365b454b2170b3b225;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git ASoC: da7213: Fix incorrect usage of bitwise '&' operator for SRM check 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 Signed-off-by: Mark Brown --- diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c index 6dd7578f0bb8..024d83fa6a7f 100644 --- a/sound/soc/codecs/da7213.c +++ b/sound/soc/codecs/da7213.c @@ -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");