From: Lucas Tanure <tanureal@opensource.cirrus.com>
To: James Schulman <james.schulman@cirrus.com>,
David Rhodes <david.rhodes@cirrus.com>,
Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>
Cc: Richard Fitzgerald <rf@opensource.cirrus.com>,
<alsa-devel@alsa-project.org>, <patches@opensource.cirrus.com>,
Lucas Tanure <tanureal@opensource.cirrus.com>,
<linux-kernel@vger.kernel.org>
Subject: [PATCH 04/15] ASoC: cs42l42: Disable regulators if probe fails
Date: Tue, 2 Mar 2021 17:04:43 +0000 [thread overview]
Message-ID: <20210302170454.39679-5-tanureal@opensource.cirrus.com> (raw)
In-Reply-To: <20210302170454.39679-1-tanureal@opensource.cirrus.com>
In case of cs42l42_i2c_probe() fail, the regulators were left enabled.
Signed-off-by: Lucas Tanure <tanureal@opensource.cirrus.com>
---
sound/soc/codecs/cs42l42.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c
index 00e303c711ddc..a567d38af8d3f 100644
--- a/sound/soc/codecs/cs42l42.c
+++ b/sound/soc/codecs/cs42l42.c
@@ -1756,8 +1756,10 @@ static int cs42l42_i2c_probe(struct i2c_client *i2c_client,
/* Reset the Device */
cs42l42->reset_gpio = devm_gpiod_get_optional(&i2c_client->dev,
"reset", GPIOD_OUT_LOW);
- if (IS_ERR(cs42l42->reset_gpio))
- return PTR_ERR(cs42l42->reset_gpio);
+ if (IS_ERR(cs42l42->reset_gpio)) {
+ ret = PTR_ERR(cs42l42->reset_gpio);
+ goto err_disable;
+ }
if (cs42l42->reset_gpio) {
dev_dbg(&i2c_client->dev, "Found reset GPIO\n");
@@ -1791,13 +1793,13 @@ static int cs42l42_i2c_probe(struct i2c_client *i2c_client,
dev_err(&i2c_client->dev,
"CS42L42 Device ID (%X). Expected %X\n",
devid, CS42L42_CHIP_ID);
- return ret;
+ goto err_disable;
}
ret = regmap_read(cs42l42->regmap, CS42L42_REVID, ®);
if (ret < 0) {
dev_err(&i2c_client->dev, "Get Revision ID failed\n");
- return ret;
+ goto err_disable;
}
dev_info(&i2c_client->dev,
@@ -1823,7 +1825,7 @@ static int cs42l42_i2c_probe(struct i2c_client *i2c_client,
if (i2c_client->dev.of_node) {
ret = cs42l42_handle_device_data(i2c_client, cs42l42);
if (ret != 0)
- return ret;
+ goto err_disable;
}
/* Setup headset detection */
--
2.30.1
next prev parent reply other threads:[~2021-03-02 20:45 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-02 17:04 [PATCH 00/15] Report jack and button detection + Capture Support Lucas Tanure
2021-03-02 17:04 ` [PATCH 01/15] ASoC: cs42l42: Don't enable/disable regulator at Bias Level Lucas Tanure
2021-03-02 17:04 ` [PATCH 02/15] ASoC: cs42l42: Always wait at least 3ms after reset Lucas Tanure
2021-03-02 17:04 ` [PATCH 03/15] ASoC: cs42l42: Remove power if the driver is being removed Lucas Tanure
2021-03-02 17:12 ` Mark Brown
2021-03-02 17:04 ` Lucas Tanure [this message]
2021-03-02 17:04 ` [PATCH 05/15] ASoC: cs42l42: Fix Bitclock polarity inversion Lucas Tanure
2021-03-02 17:15 ` Mark Brown
2021-03-02 17:04 ` [PATCH 06/15] ASoC: cs42l42: Provide finer control on playback path Lucas Tanure
2021-03-02 17:04 ` [PATCH 07/15] ASoC: cs42l42: Set clock source for both ways of stream Lucas Tanure
2021-03-03 0:02 ` kernel test robot
2021-03-02 17:04 ` [PATCH 08/15] ASoC: cs42l42: Fix channel width support Lucas Tanure
2021-03-02 17:20 ` Mark Brown
2021-03-02 17:04 ` [PATCH 09/15] ASoC: cs42l42: Add Capture Support Lucas Tanure
2021-03-02 17:04 ` [PATCH 10/15] ASoC: cs42l42: Report jack and button detection Lucas Tanure
2021-03-02 17:29 ` Mark Brown
2021-03-02 17:04 ` [PATCH 11/15] ASoC: cs42l42: Use bclk from hw_params if set_sysclk was not called Lucas Tanure
2021-03-02 17:04 ` [PATCH 12/15] ASoC: cs42l42: Wait at least 150us after writing SCLK_PRESENT Lucas Tanure
2021-03-02 17:30 ` Mark Brown
2021-03-02 22:56 ` kernel test robot
2021-03-02 22:56 ` [PATCH] ASoC: cs42l42: fix semicolon.cocci warnings kernel test robot
2021-03-02 17:04 ` [PATCH 13/15] ASoC: cs42l42: Only start PLL if it is needed Lucas Tanure
2021-03-02 17:04 ` [PATCH 14/15] ASoC: cs42l42: Wait for PLL to lock before switching to it Lucas Tanure
2021-03-02 17:04 ` [PATCH 15/15] ASoC: cs42l42: Fix mixer volume control Lucas Tanure
2021-03-02 17:30 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210302170454.39679-5-tanureal@opensource.cirrus.com \
--to=tanureal@opensource.cirrus.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=david.rhodes@cirrus.com \
--cc=james.schulman@cirrus.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=patches@opensource.cirrus.com \
--cc=rf@opensource.cirrus.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).