ASoC: tas6424: Fix the error handling of tas6424_i2c_probe()
authorZheyu Ma <zheyuma97@gmail.com>
Tue, 10 May 2022 15:32:50 +0000 (23:32 +0800)
committerMark Brown <broonie@kernel.org>
Wed, 11 May 2022 16:40:16 +0000 (17:40 +0100)
After enabling the regulator, The driver should disable the regulator
when failing at probing.

Signed-off-by: Zheyu Ma <zheyuma97@gmail.com>
Link: https://lore.kernel.org/r/20220510153251.1741210-6-zheyuma97@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/tas6424.c

index d87444e..22b5385 100644 (file)
@@ -756,7 +756,7 @@ static int tas6424_i2c_probe(struct i2c_client *client)
                                 TAS6424_RESET, TAS6424_RESET);
        if (ret) {
                dev_err(dev, "unable to reset device: %d\n", ret);
-               return ret;
+               goto disable_regs;
        }
 
        INIT_DELAYED_WORK(&tas6424->fault_check_work, tas6424_fault_check_work);
@@ -765,10 +765,14 @@ static int tas6424_i2c_probe(struct i2c_client *client)
                                     tas6424_dai, ARRAY_SIZE(tas6424_dai));
        if (ret < 0) {
                dev_err(dev, "unable to register codec: %d\n", ret);
-               return ret;
+               goto disable_regs;
        }
 
        return 0;
+
+disable_regs:
+       regulator_bulk_disable(ARRAY_SIZE(tas6424->supplies), tas6424->supplies);
+       return ret;
 }
 
 static int tas6424_i2c_remove(struct i2c_client *client)