Skip to content

Commit ee71faf

Browse files
ConchuODAndrei Simion
authored andcommitted
ASoC: atmel: fix a pair of Wtautological-overlap-compare
Clang complains: sound/soc/atmel/mchp-asrc-card.c:493:33: error: overlapping comparisons always evaluate to false [-Werror,-Wtautological-overlap-compare] if (priv->convert_channels < 1 && priv->convert_channels > 8) { ~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sound/soc/atmel/mchp-asrc-card.c:478:32: error: overlapping comparisons always evaluate to false [-Werror,-Wtautological-overlap-compare] if (priv->convert_rate < 8000 && priv->convert_rate > 192000) { ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 2 errors generated. It would appear that these were meant to be ensuring the value lies with in the range, so swap them both to ||. Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com> Signed-off-by: Conor Dooley <conor.dooley@microchip.com> (cherry picked from linux-6.1-trunk/at91/sound) Signed-off-by: Andrei Simion <andrei.simion@microchip.com>
1 parent efcad13 commit ee71faf

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

sound/soc/atmel/mchp-asrc-card.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ static int mchp_asoc_card_parse_convert(struct device *dev, struct device_node *
475475
dev_err(dev, "unable to get convert-rate for %s", np->full_name);
476476
return ret;
477477
}
478-
if (priv->convert_rate < 8000 && priv->convert_rate > 192000) {
478+
if (priv->convert_rate < 8000 || priv->convert_rate > 192000) {
479479
dev_err(dev, "invalid %sconvert-rate value for %s: %d",
480480
prefix, np->full_name, priv->convert_rate);
481481
return -EINVAL;
@@ -490,7 +490,7 @@ static int mchp_asoc_card_parse_convert(struct device *dev, struct device_node *
490490
np->full_name);
491491
return ret;
492492
}
493-
if (priv->convert_channels < 1 && priv->convert_channels > 8) {
493+
if (priv->convert_channels < 1 || priv->convert_channels > 8) {
494494
dev_err(dev, "invalid %sconvert-channels value for %s: %d",
495495
prefix, np->full_name, priv->convert_channels);
496496
return -EINVAL;

0 commit comments

Comments
 (0)