[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20220510153251.1741210-6-zheyuma97@gmail.com>
Date: Tue, 10 May 2022 23:32:50 +0800
From: Zheyu Ma <zheyuma97@...il.com>
To: james.schulman@...rus.com, david.rhodes@...rus.com,
tanureal@...nsource.cirrus.com, rf@...nsource.cirrus.com,
lgirdwood@...il.com, broonie@...nel.org, perex@...ex.cz,
tiwai@...e.com, oder_chiou@...ltek.com
Cc: alsa-devel@...a-project.org, patches@...nsource.cirrus.com,
linux-kernel@...r.kernel.org, Zheyu Ma <zheyuma97@...il.com>
Subject: [PATCH 5/6] ASoC: tas6424: Fix the error handling of tas6424_i2c_probe()
After enabling the regulator, The driver should disable the regulator
when failing at probing.
Signed-off-by: Zheyu Ma <zheyuma97@...il.com>
---
sound/soc/codecs/tas6424.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/tas6424.c b/sound/soc/codecs/tas6424.c
index d87444efed37..22b53856e691 100644
--- a/sound/soc/codecs/tas6424.c
+++ b/sound/soc/codecs/tas6424.c
@@ -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)
--
2.25.1
Powered by blists - more mailing lists