Signed-off-by: Richard Zhao richard.z...@freescale.com
---
sound/soc/fsl/fsl_ssi.c |7 ++-
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 4ed2afd..b10a427 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 = clk_get(pdev-dev, NULL);
+ ssi_private-clk = devm_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,10 +842,8 @@ 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);
@@ -871,7 +869,6 @@ 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);
--
1.7.5.4
--
To unsubscribe from this list: send the line unsubscribe linux-i2c in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
