Unverified Commit ddfd5345 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Mark Brown
Browse files

ASoC: codecs: Fix an error handling path in (rx|tx|va)_macro_probe() 



After a successful lpass_macro_pds_init() call, lpass_macro_pds_exit() must
be called.

Add the missing call in the error handling path of the probe function and
use it.

Fixes: 9e3d83c5 ("ASoC: codecs: Add power domains support in digital macro codecs")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/5b5a015a9b1dc8011c6a4053fa49da1f2531e47c.1648969065.git.christophe.jaillet@wanadoo.fr


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

sound/soc/codecs/lpass-rx-macro.c

+10 −4
Original line number Diff line number Diff line
@@ -3566,12 +3566,16 @@ static int rx_macro_probe(struct platform_device *pdev) 
		return PTR_ERR(rx->pds);



	base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(base))

		return PTR_ERR(base);

	if (IS_ERR(base)) {

		ret = PTR_ERR(base);

		goto err;

	}



	rx->regmap = devm_regmap_init_mmio(dev, base, &rx_regmap_config);

	if (IS_ERR(rx->regmap))

		return PTR_ERR(rx->regmap);

	if (IS_ERR(rx->regmap)) {

		ret = PTR_ERR(rx->regmap);

		goto err;

	}



	dev_set_drvdata(dev, rx);
@@ -3632,6 +3636,8 @@ static int rx_macro_probe(struct platform_device *pdev) 
err_dcodec:

	clk_disable_unprepare(rx->macro);

err:

	lpass_macro_pds_exit(rx->pds);



	return ret;

}

sound/soc/codecs/lpass-tx-macro.c

+10 −4
Original line number Diff line number Diff line
@@ -1828,8 +1828,10 @@ static int tx_macro_probe(struct platform_device *pdev) 
		return PTR_ERR(tx->pds);



	base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(base))

		return PTR_ERR(base);

	if (IS_ERR(base)) {

		ret = PTR_ERR(base);

		goto err;

	}



	/* Update defaults for lpass sc7280 */

	if (of_device_is_compatible(np, "qcom,sc7280-lpass-tx-macro")) {
@@ -1846,8 +1848,10 @@ static int tx_macro_probe(struct platform_device *pdev) 
	}



	tx->regmap = devm_regmap_init_mmio(dev, base, &tx_regmap_config);

	if (IS_ERR(tx->regmap))

		return PTR_ERR(tx->regmap);

	if (IS_ERR(tx->regmap)) {

		ret = PTR_ERR(tx->regmap);

		goto err;

	}



	dev_set_drvdata(dev, tx);
@@ -1907,6 +1911,8 @@ static int tx_macro_probe(struct platform_device *pdev) 
err_dcodec:

	clk_disable_unprepare(tx->macro);

err:

	lpass_macro_pds_exit(tx->pds);



	return ret;

}

sound/soc/codecs/lpass-va-macro.c

+6 −2
Original line number Diff line number Diff line
@@ -1434,8 +1434,10 @@ static int va_macro_probe(struct platform_device *pdev) 
		va->dmic_clk_div = VA_MACRO_CLK_DIV_2;

	} else {

		ret = va_macro_validate_dmic_sample_rate(sample_rate, va);

		if (!ret)

			return -EINVAL;

		if (!ret) {

			ret = -EINVAL;

			goto err;

		}

	}



	base = devm_platform_ioremap_resource(pdev, 0);
@@ -1492,6 +1494,8 @@ static int va_macro_probe(struct platform_device *pdev) 
err_dcodec:

	clk_disable_unprepare(va->macro);

err:

	lpass_macro_pds_exit(va->pds);



	return ret;

}