summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorAndrew Jackson <Andrew.Jackson@arm.com>2014-12-30 13:55:44 +0300
committerMark Brown <broonie@kernel.org>2014-12-30 19:49:36 +0300
commit3a19272a507cd5ad214e0082c3ff7355dfe71329 (patch)
tree6e00088125ba23f6766607e6b6edf516edeef625 /sound/soc
parentb226efe5818bf01cecc8a3e0fbd0def4ebbcedaa (diff)
downloadlinux-3a19272a507cd5ad214e0082c3ff7355dfe71329.tar.xz
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>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/dwc/designware_i2s.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/soc/dwc/designware_i2s.c b/sound/soc/dwc/designware_i2s.c
index d3bdc6890eb5..a6327cc086c0 100644
--- a/sound/soc/dwc/designware_i2s.c
+++ b/sound/soc/dwc/designware_i2s.c
@@ -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;
}