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: Andrew Jackson <Andrew.Jackson@arm.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Andrew Jackson 2014-12-30 10:55:44 +00:00 committed by Mark Brown
parent b226efe581
commit 3a19272a50

View file

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