[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20230419114546.820921-1-arnd@kernel.org>
Date: Wed, 19 Apr 2023 13:45:39 +0200
From: Arnd Bergmann <arnd@...nel.org>
To: Liam Girdwood <lgirdwood@...il.com>,
Mark Brown <broonie@...nel.org>,
Jaroslav Kysela <perex@...ex.cz>,
Takashi Iwai <tiwai@...e.com>,
Nathan Chancellor <nathan@...nel.org>,
Nick Desaulniers <ndesaulniers@...gle.com>,
David Lin <CTLIN0@...oton.com>
Cc: Arnd Bergmann <arnd@...db.de>, Tom Rix <trix@...hat.com>,
Peter Rosin <peda@...ntia.se>,
Dmitry Torokhov <dmitry.torokhov@...il.com>,
Hans Verkuil <hverkuil-cisco@...all.nl>,
Charles Keepax <ckeepax@...nsource.cirrus.com>,
Uwe Kleine-König
<u.kleine-koenig@...gutronix.de>, alsa-devel@...a-project.org,
linux-kernel@...r.kernel.org, llvm@...ts.linux.dev
Subject: [PATCH] ASoC: nau8825: fix delay time range check
From: Arnd Bergmann <arnd@...db.de>
clang points out that the recently added range check is nonsensical:
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)
~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~
The DT binding document confirms that the intention is to warn if
it's outside of the 125..500 range, so do that instead.
Fixes: fc0b096c9291 ("ASoC: nau8825: Add delay control for input path")
Signed-off-by: Arnd Bergmann <arnd@...db.de>
---
sound/soc/codecs/nau8825.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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");
--
2.39.2
Powered by blists - more mailing lists