Skip to content

Commit

Permalink
Revert "ASoC: fsl_ssi: convert to use devm_clk_get"
Browse files Browse the repository at this point in the history
This reverts commit 014e5b5 since
PowerPC doesn't use clkdev and hasn't implemented devm_clk_get() itself.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Mark Brown committed Jun 5, 2012
1 parent 134b2f5 commit 61dc479
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions sound/soc/fsl/fsl_ssi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -842,8 +842,10 @@ static int __devinit fsl_ssi_probe(struct platform_device *pdev)
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);
Expand All @@ -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);
Expand Down

0 comments on commit 61dc479

Please sign in to comment.