]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ASoC: da7218: Fix incorrect usage of bitwise '&' operator for SRM check
authorAdam Thomson <Adam.Thomson.Opensource@diasemi.com>
Tue, 23 May 2017 08:20:13 +0000 (09:20 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 23 May 2017 11:23:08 +0000 (12:23 +0100)
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>
Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/da7218.c

index d256ebf9e309de299b0711688366c5c5cdb74274..6e1940eb0653c720c646710d057c11337a01fb70 100644 (file)
@@ -1457,7 +1457,7 @@ static int da7218_dai_event(struct snd_soc_dapm_widget *w,
                                ++i;
                                msleep(DA7218_SRM_CHECK_DELAY);
                        }
-               } while ((i < DA7218_SRM_CHECK_TRIES) & (!success));
+               } while ((i < DA7218_SRM_CHECK_TRIES) && (!success));
 
                if (!success)
                        dev_warn(codec->dev, "SRM failed to lock\n");