ASoC: cs42l51: Fix some error handling paths in cs42l51_probe()

[ Upstream commit d221b844ee79823ffc29b7badc4010bdb0960224 ]

If devm_gpiod_get_optional() fails, we need to disable previously enabled
regulators, as done in the other error handling path of the function.

Also, gpiod_set_value_cansleep(, 1) needs to be called to undo a
potential gpiod_set_value_cansleep(, 0).
If the "reset" gpio is not defined, this additional call is just a no-op.

This behavior is the same as the one already in the .remove() function.

Fixes: 11b9cd748e31 ("ASoC: cs42l51: add reset management")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/a5e5f4b9fb03f46abd2c93ed94b5c395972ce0d1.1729975570.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/sound/soc/codecs/cs42l51.c b/sound/soc/codecs/cs42l51.c
index 4b026e1c3fe3e4a3ef60d2c1de4c0f2e3ca10c8a..09445db29aa1f8df578cbdf4b1075105b8ed5dc8 100644 (file)
--- a/sound/soc/codecs/cs42l51.c
+++ b/sound/soc/codecs/cs42l51.c
@@ -754,8 +754,10 @@ int cs42l51_probe(struct device *dev, struct regmap *regmap)
 
        cs42l51->reset_gpio = devm_gpiod_get_optional(dev, "reset",
                                                      GPIOD_OUT_LOW);
-       if (IS_ERR(cs42l51->reset_gpio))
-               return PTR_ERR(cs42l51->reset_gpio);
+       if (IS_ERR(cs42l51->reset_gpio)) {
+               ret = PTR_ERR(cs42l51->reset_gpio);
+               goto error;
+       }
 
        if (cs42l51->reset_gpio) {
                dev_dbg(dev, "Release reset gpio\n");
@@ -787,6 +789,7 @@ int cs42l51_probe(struct device *dev, struct regmap *regmap)
        return 0;
 
 error:
+       gpiod_set_value_cansleep(cs42l51->reset_gpio, 1);
        regulator_bulk_disable(ARRAY_SIZE(cs42l51->supplies),
                               cs42l51->supplies);
        return ret;