diff mbox series

sound: soc: codec: tlv320adcx140: fix 'ti,gpio-config' DT property init

Message ID 20230211191315.24554-1-alex@shruggie.ro (mailing list archive)
State Superseded
Headers show
Series sound: soc: codec: tlv320adcx140: fix 'ti,gpio-config' DT property init | expand

Commit Message

Alexandru Ardelean Feb. 11, 2023, 7:13 p.m. UTC 
From: Steffen Aschbacher <steffen.aschbacher@stihl.de>

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 no elements.

This change extends the check to also handle for an error case (most likely
to be hit by the case that the 'ti,gpio-config' is not defined).
Semantically, this would be the same as 'device_property_count_u32()'
returning zero.

In case that 'ti,gpio-config' is defined, and returns a 'gpio_count' value
that is incorrect, there is an '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.

Signed-off-by: Steffen Aschbacher <steffen.aschbacher@stihl.de>
Signed-off-by: Alexandru Ardelean <alex@shruggie.ro>
---
 sound/soc/codecs/tlv320adcx140.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Mark Brown Feb. 13, 2023, 12:38 p.m. UTC | #1 
On Sat, Feb 11, 2023 at 09:13:15PM +0200, Alexandru Ardelean wrote:
> From: Steffen Aschbacher <steffen.aschbacher@stihl.de>
> 
> When the 'ti,gpio-config' property is not defined, the
> device_property_count_u32() will return an error, rather than zero.

Please submit patches using subject lines reflecting the style for the
subsystem, this makes it easier for people to identify relevant patches.
Look at what existing commits in the area you're changing are doing and
make sure your subject lines visually resemble what they're doing.
There's no need to resubmit to fix this alone.
Alexandru Ardelean Feb. 14, 2023, 8:06 a.m. UTC | #2 
On Mon, Feb 13, 2023 at 2:38 PM Mark Brown <broonie@kernel.org> wrote:
>
> On Sat, Feb 11, 2023 at 09:13:15PM +0200, Alexandru Ardelean wrote:
> > From: Steffen Aschbacher <steffen.aschbacher@stihl.de>
> >
> > When the 'ti,gpio-config' property is not defined, the
> > device_property_count_u32() will return an error, rather than zero.
>
> Please submit patches using subject lines reflecting the style for the
> subsystem, this makes it easier for people to identify relevant patches.

Ack.

> Look at what existing commits in the area you're changing are doing and
> make sure your subject lines visually resemble what they're doing.

Will do.

> There's no need to resubmit to fix this alone.

Thank you :)
diff mbox series

Patch

diff --git a/sound/soc/codecs/tlv320adcx140.c b/sound/soc/codecs/tlv320adcx140.c
index 91a22d927915..530f321d08e9 100644
--- a/sound/soc/codecs/tlv320adcx140.c
+++ b/sound/soc/codecs/tlv320adcx140.c
@@ -925,7 +925,7 @@  static int adcx140_configure_gpio(struct adcx140_priv *adcx140)
 
 	gpio_count = device_property_count_u32(adcx140->dev,
 			"ti,gpio-config");
-	if (gpio_count == 0)
+	if (gpio_count <= 0)
 		return 0;
 
 	if (gpio_count != ADCX140_NUM_GPIO_CFGS)