[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20200908083521.14105-1-camel.guo@axis.com>
Date: Tue, 8 Sep 2020 10:35:20 +0200
From: Camel Guo <camel.guo@...s.com>
To: <lgirdwood@...il.com>, <broonie@...nel.org>, <tiwai@...e.com>,
<dmurphy@...com>
CC: <alsa-devel@...a-project.org>, <linux-kernel@...r.kernel.org>,
<kernel@...s.com>, Camel Guo <camelg@...s.com>
Subject: [PATCH 1/2] ASoC: tlv320adcx140: Avoid accessing invalid gpio_reset
From: Camel Guo <camelg@...s.com>
When gpio_reset is not well defined in devicetree, the
adcx140->gpio_reset is an error code instead of NULL. In this case,
adcx140->gpio_reset should not be used by adcx140_reset. This commit
sets it NULL to avoid accessing an invalid variable.
Signed-off-by: Camel Guo <camelg@...s.com>
---
sound/soc/codecs/tlv320adcx140.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sound/soc/codecs/tlv320adcx140.c b/sound/soc/codecs/tlv320adcx140.c
index 7ae6ec374be3..597dd1062943 100644
--- a/sound/soc/codecs/tlv320adcx140.c
+++ b/sound/soc/codecs/tlv320adcx140.c
@@ -984,8 +984,10 @@ static int adcx140_i2c_probe(struct i2c_client *i2c,
adcx140->gpio_reset = devm_gpiod_get_optional(adcx140->dev,
"reset", GPIOD_OUT_LOW);
- if (IS_ERR(adcx140->gpio_reset))
+ if (IS_ERR(adcx140->gpio_reset) || adcx140->gpio_reset == NULL) {
dev_info(&i2c->dev, "Reset GPIO not defined\n");
+ adcx140->gpio_reset = NULL;
+ }
adcx140->supply_areg = devm_regulator_get_optional(adcx140->dev,
"areg");
--
2.20.1
Powered by blists - more mailing lists