summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorNuno Sá <nuno.sa@analog.com>2023-02-24 11:45:51 +0100
committerMark Brown <broonie@kernel.org>2023-02-24 13:12:50 +0000
commitb5bfa7277ee7d944421e0ef193586c6e34d7492c (patch)
tree98f82052e66942494791e079eae5467e9f04e4b9 /sound
parentb361d5d2464a88184f6e17a6462719ba79180b1a (diff)
downloadlinux-b5bfa7277ee7d944421e0ef193586c6e34d7492c.tar.gz
linux-b5bfa7277ee7d944421e0ef193586c6e34d7492c.tar.bz2
linux-b5bfa7277ee7d944421e0ef193586c6e34d7492c.zip
ASoC: adau7118: don't disable regulators on device unbind
The regulators are supposed to be controlled through the set_bias_level() component callback. Moreover, the regulators are not enabled during probe and so, this would lead to a regulator unbalanced use count. Fixes: ca514c0f12b02 ("ASOC: Add ADAU7118 8 Channel PDM-to-I2S/TDM Converter driver") Signed-off-by: Nuno Sá <nuno.sa@analog.com> Link: https://lore.kernel.org/r/20230224104551.1139981-1-nuno.sa@analog.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/adau7118.c19
1 files changed, 1 insertions, 18 deletions
diff --git a/sound/soc/codecs/adau7118.c b/sound/soc/codecs/adau7118.c
index bbb097249887..a663d37e5776 100644
--- a/sound/soc/codecs/adau7118.c
+++ b/sound/soc/codecs/adau7118.c
@@ -444,22 +444,6 @@ static const struct snd_soc_component_driver adau7118_component_driver = {
.endianness = 1,
};
-static void adau7118_regulator_disable(void *data)
-{
- struct adau7118_data *st = data;
- int ret;
- /*
- * If we fail to disable DVDD, don't bother in trying IOVDD. We
- * actually don't want to be left in the situation where DVDD
- * is enabled and IOVDD is disabled.
- */
- ret = regulator_disable(st->dvdd);
- if (ret)
- return;
-
- regulator_disable(st->iovdd);
-}
-
static int adau7118_regulator_setup(struct adau7118_data *st)
{
st->iovdd = devm_regulator_get(st->dev, "iovdd");
@@ -481,8 +465,7 @@ static int adau7118_regulator_setup(struct adau7118_data *st)
regcache_cache_only(st->map, true);
}
- return devm_add_action_or_reset(st->dev, adau7118_regulator_disable,
- st);
+ return 0;
}
static int adau7118_parset_dt(const struct adau7118_data *st)