Re: [PATCH] ASoC: nau8825: fix bounds check for adc_delay

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 4/18/2023 8:09 PM, Tom Rix wrote:
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@xxxxxxxxxx>
---
  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");

Sorry, it is my fault. You are right.

Acked-by: David Lin <CTLIN0@xxxxxxxxxxx>

________________________________
________________________________
The privileged confidential information contained in this email is intended for use only by the addressees as indicated by the original sender of this email. If you are not the addressee indicated in this email or are not responsible for delivery of the email to such a person, please kindly reply to the sender indicating this fact and delete all copies of it from your computer and network server immediately. Your cooperation is highly appreciated. It is advised that any unauthorized use of confidential information of Nuvoton is strictly prohibited; and any information in this email irrelevant to the official business of Nuvoton shall be deemed as neither given nor endorsed by Nuvoton.




[Index of Archives]     [ALSA User]     [Linux Audio Users]     [Pulse Audio]     [Kernel Archive]     [Asterisk PBX]     [Photo Sharing]     [Linux Sound]     [Video 4 Linux]     [Gimp]     [Yosemite News]

  Powered by Linux