diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-05 11:08:45 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-05 11:08:45 +0100 |
| commit | 61dc479e99d4d74c6113656dc50babed90a384c5 (patch) | |
| tree | 5b4e31a609a00018c94b20fabfe2c0cd8f5c4d17 /sound/soc/fsl | |
| parent | 134b2f576b9144223dd5b59a496218e3aadaf56b (diff) | |
| download | linux-3.10-61dc479e99d4d74c6113656dc50babed90a384c5.tar.gz linux-3.10-61dc479e99d4d74c6113656dc50babed90a384c5.tar.bz2 linux-3.10-61dc479e99d4d74c6113656dc50babed90a384c5.zip | |
Revert "ASoC: fsl_ssi: convert to use devm_clk_get"
This reverts commit 014e5b56702575c5cd8ffc4b1a7924cfdfe0f1ea since
PowerPC doesn't use clkdev and hasn't implemented devm_clk_get() itself.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/fsl')
| -rw-r--r-- | sound/soc/fsl/fsl_ssi.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index b10a427a809..4ed2afd4778 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -725,7 +725,7 @@ static int __devinit fsl_ssi_probe(struct platform_device *pdev) u32 dma_events[2]; ssi_private->ssi_on_imx = true; - ssi_private->clk = devm_clk_get(&pdev->dev, NULL); + ssi_private->clk = clk_get(&pdev->dev, NULL); if (IS_ERR(ssi_private->clk)) { ret = PTR_ERR(ssi_private->clk); dev_err(&pdev->dev, "could not get clock: %d\n", ret); @@ -842,8 +842,10 @@ error_dev: device_remove_file(&pdev->dev, dev_attr); error_clk: - if (ssi_private->ssi_on_imx) + if (ssi_private->ssi_on_imx) { clk_disable_unprepare(ssi_private->clk); + clk_put(ssi_private->clk); + } error_irq: free_irq(ssi_private->irq, ssi_private); @@ -869,6 +871,7 @@ static int fsl_ssi_remove(struct platform_device *pdev) if (ssi_private->ssi_on_imx) { platform_device_unregister(ssi_private->imx_pcm_pdev); clk_disable_unprepare(ssi_private->clk); + clk_put(ssi_private->clk); } snd_soc_unregister_dai(&pdev->dev); device_remove_file(&pdev->dev, &ssi_private->dev_attr); |