iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Fixes: 9d4befff5a ("ASoC: codec: tlv3204: Moving GPIO reset and add ADC reset")
Signed-off-by: Matthias 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: Mark Brown <broonie@kernel.org>
This commit is contained in:
Matthias Schiffer 2020-09-02 15:30:42 +02:00 committed by Mark Brown
parent abe42b0911
commit 251e5c8694
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sound/soc/codecs/tlv320aic32x4.c
View File

@ -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);