diff mbox series

ASoC: nau8825: fix bounds check for adc_delay

Message ID 20230418120955.3230705-1-trix@redhat.com
State New
Headers
Series ASoC: nau8825: fix bounds check for adc_delay |

Commit Message

Tom Rix April 18, 2023, 12:09 p.m. UTC 
  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>
---
 sound/soc/codecs/nau8825.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

David Lin April 18, 2023, 12:23 p.m. UTC | #1 
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@redhat.com>
> ---
>   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@nuvoton.com>
Mark Brown April 18, 2023, 4:21 p.m. UTC | #2 
On Tue, 18 Apr 2023 08:09:55 -0400, 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.
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: nau8825: fix bounds check for adc_delay
      commit: 5f3d94eb7ae877430d9fe6a9aae7dcef6c3e5fea

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark
diff mbox series

Patch

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");