Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a19272a authored by Andrew Jackson's avatar Andrew Jackson Committed by Mark Brown
Browse files

ASoC: dwc: Prepare clock before use 



Some I2S clocks may require some time to get the clock ready
for operation and so need to be prepared before they are enabled.
So, prepare the clock as well as enabling it, but combine the
two through clk_prepare_enable.

Signed-off-by: default avatarAndrew Jackson <Andrew.Jackson@arm.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent b226efe5

sound/soc/dwc/designware_i2s.c

+5 −2
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ static int dw_i2s_probe(struct platform_device *pdev) 
	if (IS_ERR(dev->clk))

		return  PTR_ERR(dev->clk);



	ret = clk_enable(dev->clk);

	ret = clk_prepare_enable(dev->clk);

	if (ret < 0)

		return ret;
@@ -491,13 +491,16 @@ static int dw_i2s_probe(struct platform_device *pdev) 
	return 0;



err_clk_disable:

	clk_disable(dev->clk);

	clk_disable_unprepare(dev->clk);

	return ret;

}



static int dw_i2s_remove(struct platform_device *pdev)

{

	struct dw_i2s_dev *dev = dev_get_drvdata(&pdev->dev);



	snd_soc_unregister_component(&pdev->dev);

	clk_disable_unprepare(dev->clk);



	return 0;

}