Unverified Commit 251e5c86 authored by Matthias Schiffer's avatar Matthias Schiffer Committed by Mark Brown
Browse files

ASoC: codec: tlv320aic32x4: fix missing aic32x4_disable_regulators() in error path 



The regulators need to be disabled in the aic32x4_register_clocks()
failure case as well.

Fixes: 9d4befff ("ASoC: codec: tlv3204: Moving GPIO reset and add ADC reset")
Signed-off-by: default avatarMatthias Schiffer <matthias.schiffer@ew.tq-group.com>
Link: https://lore.kernel.org/r/20200902133043.19504-1-matthias.schiffer@ew.tq-group.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent abe42b09

sound/soc/codecs/tlv320aic32x4.c

+7 −3
Original line number Diff line number Diff line
@@ -1230,8 +1230,7 @@ int aic32x4_probe(struct device *dev, struct regmap *regmap) 
			&soc_component_dev_aic32x4, &aic32x4_dai, 1);

	if (ret) {

		dev_err(dev, "Failed to register component\n");

		aic32x4_disable_regulators(aic32x4);

		return ret;

		goto err_disable_regulators;

	}



	if (gpio_is_valid(aic32x4->rstn_gpio)) {
@@ -1242,9 +1241,14 @@ int aic32x4_probe(struct device *dev, struct regmap *regmap) 


	ret = aic32x4_register_clocks(dev, aic32x4->mclk_name);

	if (ret)

		return ret;

		goto err_disable_regulators;



	return 0;



err_disable_regulators:

	aic32x4_disable_regulators(aic32x4);



	return ret;

}

EXPORT_SYMBOL(aic32x4_probe);