Skip to content

Commit

Permalink
ASoC: adau7118: don't disable regulators on device unbind
Browse files Browse the repository at this point in the history
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: ca514c0 ("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>
  • Loading branch information
Nuno Sá authored and Mark Brown committed Feb 24, 2023
1 parent b361d5d commit b5bfa72
Showing 1 changed file with 1 addition and 18 deletions.
19 changes: 1 addition & 18 deletions sound/soc/codecs/adau7118.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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)
Expand Down

0 comments on commit b5bfa72

Please sign in to comment.