]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
ASoC: tlv320adcx140: Fix mic_bias and vref device tree verification
authorDan Murphy <dmurphy@ti.com>
Wed, 4 Mar 2020 19:34:27 +0000 (13:34 -0600)
committerMark Brown <broonie@kernel.org>
Thu, 5 Mar 2020 13:15:16 +0000 (13:15 +0000)
Fix the range verification check for the mic_bias and vref device tree
entries.

Fixes 37bde5acf040 ("ASoC: tlv320adcx140: Add the tlv320adcx140 codec driver family")
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Link: https://lore.kernel.org/r/20200304193427.16886-1-dmurphy@ti.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/tlv320adcx140.c

index 93a0cb8e662ccfcb60fd7df3ab8aa6a0fd7bfc76..38897568ee9699283f671222eb22e80e08ba50ec 100644 (file)
@@ -748,9 +748,8 @@ static int adcx140_codec_probe(struct snd_soc_component *component)
        if (ret)
                bias_source = ADCX140_MIC_BIAS_VAL_VREF;
 
-       if (bias_source != ADCX140_MIC_BIAS_VAL_VREF &&
-           bias_source != ADCX140_MIC_BIAS_VAL_VREF_1096 &&
-           bias_source != ADCX140_MIC_BIAS_VAL_AVDD) {
+       if (bias_source < ADCX140_MIC_BIAS_VAL_VREF ||
+           bias_source > ADCX140_MIC_BIAS_VAL_AVDD) {
                dev_err(adcx140->dev, "Mic Bias source value is invalid\n");
                return -EINVAL;
        }
@@ -760,9 +759,8 @@ static int adcx140_codec_probe(struct snd_soc_component *component)
        if (ret)
                vref_source = ADCX140_MIC_BIAS_VREF_275V;
 
-       if (vref_source != ADCX140_MIC_BIAS_VREF_275V &&
-           vref_source != ADCX140_MIC_BIAS_VREF_25V &&
-           vref_source != ADCX140_MIC_BIAS_VREF_1375V) {
+       if (vref_source < ADCX140_MIC_BIAS_VREF_275V ||
+           vref_source > ADCX140_MIC_BIAS_VREF_1375V) {
                dev_err(adcx140->dev, "Mic Bias source value is invalid\n");
                return -EINVAL;
        }