---

yaml --- r: 316214 b: refs/heads/master c: 61dc479 h: refs/heads/master v: v3
git-mirror · Jun 5, 2012 · 3614e6b · 3614e6b
1 parent 29b0292
commit 3614e6b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 134b2f576b9144223dd5b59a496218e3aadaf56b
+refs/heads/master: 61dc479e99d4d74c6113656dc50babed90a384c5
diff --git a/trunk/sound/soc/fsl/fsl_ssi.c b/trunk/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 @@ 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);
@@ -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);