ASoC: nau8825: fix bounds check for adc_delay
authorTom Rix <trix@redhat.com>
Tue, 18 Apr 2023 12:09:55 +0000 (08:09 -0400)
committerMark Brown <broonie@kernel.org>
Tue, 18 Apr 2023 13:02:20 +0000 (14:02 +0100)
clang build reports
sound/soc/codecs/nau8825.c:2826:31: error: overlapping comparisons
  always evaluate to false [-Werror,-Wtautological-overlap-compare]
        if (nau8825->adc_delay < 125 && nau8825->adc_delay > 500)
            ~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~

This is a bug, a logical-or should have been used.

Fixes: fc0b096c9291 ("ASoC: nau8825: Add delay control for input path")
Signed-off-by: Tom Rix <trix@redhat.com>
Acked-by: David Lin <CTLIN0@nuvoton.com>
Link: https://lore.kernel.org/r/20230418120955.3230705-1-trix@redhat.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/nau8825.c

index c4389f5..f4eb999 100644 (file)
@@ -2823,7 +2823,7 @@ static int nau8825_read_device_properties(struct device *dev,
        ret = device_property_read_u32(dev, "nuvoton,adc-delay-ms", &nau8825->adc_delay);
        if (ret)
                nau8825->adc_delay = 125;
-       if (nau8825->adc_delay < 125 && nau8825->adc_delay > 500)
+       if (nau8825->adc_delay < 125 || nau8825->adc_delay > 500)
                dev_warn(dev, "Please set the suitable delay time!\n");
 
        nau8825->mclk = devm_clk_get(dev, "mclk");