From: Lucas Tanure <tanureal@opensource.cirrus.com> To: James Schulman <james.schulman@cirrus.com>, David Rhodes <david.rhodes@cirrus.com>, Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>, Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com> Cc: <alsa-devel@alsa-project.org>, <linux-kernel@vger.kernel.org>, <patches@opensource.cirrus.com>, Lucas Tanure <tanureal@opensource.cirrus.com> Subject: [PATCH v3 07/15] ASoC: cs42l42: Disable regulators if probe fails Date: Sat, 6 Mar 2021 18:55:45 +0000 [thread overview] Message-ID: <20210306185553.62053-8-tanureal@opensource.cirrus.com> (raw) In-Reply-To: <20210306185553.62053-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> --- Changes in v3: - No changes Changes in v2: - No changes 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 f61404de139b0..81cdd09d80bb3 100644 --- a/sound/soc/codecs/cs42l42.c +++ b/sound/soc/codecs/cs42l42.c @@ -1750,8 +1750,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"); @@ -1785,13 +1787,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, @@ -1817,7 +1819,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
WARNING: multiple messages have this Message-ID (diff)
From: Lucas Tanure <tanureal@opensource.cirrus.com> To: James Schulman <james.schulman@cirrus.com>, David Rhodes <david.rhodes@cirrus.com>, Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>, Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com> Cc: patches@opensource.cirrus.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Lucas Tanure <tanureal@opensource.cirrus.com> Subject: [PATCH v3 07/15] ASoC: cs42l42: Disable regulators if probe fails Date: Sat, 6 Mar 2021 18:55:45 +0000 [thread overview] Message-ID: <20210306185553.62053-8-tanureal@opensource.cirrus.com> (raw) In-Reply-To: <20210306185553.62053-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> --- Changes in v3: - No changes Changes in v2: - No changes 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 f61404de139b0..81cdd09d80bb3 100644 --- a/sound/soc/codecs/cs42l42.c +++ b/sound/soc/codecs/cs42l42.c @@ -1750,8 +1750,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"); @@ -1785,13 +1787,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, @@ -1817,7 +1819,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-06 19:14 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-03-06 18:55 [PATCH v3 00/15] Report jack and button detection + Capture Support Lucas Tanure 2021-03-06 18:55 ` Lucas Tanure 2021-03-06 18:55 ` [PATCH v3 01/15] ASoC: cs42l42: Fix Bitclock polarity inversion Lucas Tanure 2021-03-06 18:55 ` Lucas Tanure 2021-03-06 18:55 ` [PATCH v3 02/15] ASoC: cs42l42: Fix channel width support Lucas Tanure 2021-03-06 18:55 ` Lucas Tanure 2021-03-06 18:55 ` [PATCH v3 03/15] ASoC: cs42l42: Fix mixer volume control Lucas Tanure 2021-03-06 18:55 ` Lucas Tanure 2021-03-06 18:55 ` [PATCH v3 04/15] ASoC: cs42l42: Don't enable/disable regulator at Bias Level Lucas Tanure 2021-03-06 18:55 ` Lucas Tanure 2021-03-06 18:55 ` [PATCH v3 05/15] ASoC: cs42l42: Always wait at least 3ms after reset Lucas Tanure 2021-03-06 18:55 ` Lucas Tanure 2021-03-06 18:55 ` [PATCH v3 06/15] ASoC: cs42l42: Remove power if the driver is being removed Lucas Tanure 2021-03-06 18:55 ` Lucas Tanure 2021-03-06 18:55 ` Lucas Tanure [this message] 2021-03-06 18:55 ` [PATCH v3 07/15] ASoC: cs42l42: Disable regulators if probe fails Lucas Tanure 2021-03-06 18:55 ` [PATCH v3 08/15] ASoC: cs42l42: Provide finer control on playback path Lucas Tanure 2021-03-06 18:55 ` Lucas Tanure 2021-03-06 18:55 ` [PATCH v3 09/15] ASoC: cs42l42: Set clock source for both ways of stream Lucas Tanure 2021-03-06 18:55 ` Lucas Tanure 2021-03-06 18:55 ` [PATCH v3 10/15] ASoC: cs42l42: Add Capture Support Lucas Tanure 2021-03-06 18:55 ` Lucas Tanure 2021-03-06 18:55 ` [PATCH v3 11/15] ASoC: cs42l42: Report jack and button detection Lucas Tanure 2021-03-06 18:55 ` Lucas Tanure 2021-03-06 18:55 ` [PATCH v3 12/15] ASoC: cs42l42: Use bclk from hw_params if set_sysclk was not called Lucas Tanure 2021-03-06 18:55 ` Lucas Tanure 2021-03-06 18:55 ` [PATCH v3 13/15] ASoC: cs42l42: Wait at least 150us after writing SCLK_PRESENT Lucas Tanure 2021-03-06 18:55 ` Lucas Tanure 2021-03-06 18:55 ` [PATCH v3 14/15] ASoC: cs42l42: Only start PLL if it is needed Lucas Tanure 2021-03-06 18:55 ` Lucas Tanure 2021-03-06 18:55 ` [PATCH v3 15/15] ASoC: cs42l42: Wait for PLL to lock before switching to it Lucas Tanure 2021-03-06 18:55 ` Lucas Tanure 2021-03-09 19:06 ` (subset) [PATCH v3 00/15] Report jack and button detection + Capture Support Mark Brown 2021-03-09 19:06 ` 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=20210306185553.62053-8-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=perex@perex.cz \ --cc=tiwai@suse.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.