ASoC: cs42l42: Disable regulators if probe fails

In case of cs42l42_i2c_probe() fail, the regulators were left enabled.

Signed-off-by: Lucas Tanure <tanureal@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20210306185553.62053-8-tanureal@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c
index f61404de139b0980884c33b60f41df6ba971ef8b..81cdd09d80bb33e78b2c8313f6ad0b2105b69a9a 100644 (file)
--- 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, &reg);
        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 */