summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rix <trix@redhat.com>2023-04-18 15:09:55 +0300
committerMark Brown <broonie@kernel.org>2023-04-18 16:02:20 +0300
commit5f3d94eb7ae877430d9fe6a9aae7dcef6c3e5fea (patch)
tree586fc6dc7e3301d0d5fd7673557f7489bf218967
parent67380533d450000699848e292d20ec18d0321f0e (diff)
downloadlinux-5f3d94eb7ae877430d9fe6a9aae7dcef6c3e5fea.tar.xz
ASoC: nau8825: fix bounds check for adc_delay
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>
-rw-r--r--sound/soc/codecs/nau8825.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c
index c4389f5fe603..f4eb999761a4 100644
--- a/sound/soc/codecs/nau8825.c
+++ b/sound/soc/codecs/nau8825.c
@@ -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");