Commit 771725ef authored by Steffen Aschbacher's avatar Steffen Aschbacher Committed by Mark Brown

ASoC: tlv320adcx140: fix 'ti,gpio-config' DT property init

When the 'ti,gpio-config' property is not defined, the
device_property_count_u32() will return an error, rather than zero.

The current check, only handles a return value of zero, which assumes that
the property is defined and has nothing defined.

This change extends the check to also check for an error case (most likely
to be hit by the case that the 'ti,gpio-config' is not defined).

In case that the 'ti,gpio-config' and the returned 'gpio_count' is not
correct, there is a 'if (gpio_count != ADCX140_NUM_GPIO_CFGS)' check, a few
lines lower that will return -EINVAL.
This means that someone tried to define 'ti,gpio-config', but with the
wrong number of GPIOs.

Fixes: d5214321 ("ASoC: tlv320adcx140: Add support for configuring GPIO pin")
Signed-off-by: default avatarSteffen Aschbacher <steffen.aschbacher@stihl.de>
Signed-off-by: default avatarAlexandru Ardelean <alex@shruggie.ro>
Link: https://lore.kernel.org/r/20230213073805.14640-1-alex@shruggie.roSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4680716d
...@@ -925,7 +925,7 @@ static int adcx140_configure_gpio(struct adcx140_priv *adcx140) ...@@ -925,7 +925,7 @@ static int adcx140_configure_gpio(struct adcx140_priv *adcx140)
gpio_count = device_property_count_u32(adcx140->dev, gpio_count = device_property_count_u32(adcx140->dev,
"ti,gpio-config"); "ti,gpio-config");
if (gpio_count == 0) if (gpio_count <= 0)
return 0; return 0;
if (gpio_count != ADCX140_NUM_GPIO_CFGS) if (gpio_count != ADCX140_NUM_GPIO_CFGS)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment