---

yaml --- r: 350763 b: refs/heads/master c: e5118cd h: refs/heads/master i: 350761: 8880cc4 350759: e9fc037 v: v3
git-mirror · Feb 5, 2013 · cc16c67 · cc16c67
1 parent 078eed8
commit cc16c67
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f305a0a8d7fcd1a600bd0b727cd8137ed223f721
+refs/heads/master: e5118cd2c2881db18a92eec68d1b29db9bcbcaf3
diff --git a/trunk/drivers/spi/spi-sirf.c b/trunk/drivers/spi/spi-sirf.c
@@ -569,7 +569,7 @@ static int spi_sirfsoc_probe(struct platform_device *pdev)
 		ret = -EINVAL;
 		goto free_pin;
 	}
-	clk_enable(sspi->clk);
+	clk_prepare_enable(sspi->clk);
 	sspi->ctrl_freq = clk_get_rate(sspi->clk);
 
 	init_completion(&sspi->done);
@@ -593,7 +593,7 @@ static int spi_sirfsoc_probe(struct platform_device *pdev)
 	return 0;
 
 free_clk:
-	clk_disable(sspi->clk);
+	clk_disable_unprepare(sspi->clk);
 	clk_put(sspi->clk);
 free_pin:
 	pinctrl_put(sspi->p);
@@ -617,7 +617,7 @@ static int  spi_sirfsoc_remove(struct platform_device *pdev)
 		if (sspi->chipselect[i] > 0)
 			gpio_free(sspi->chipselect[i]);
 	}
-	clk_disable(sspi->clk);
+	clk_disable_unprepare(sspi->clk);
 	clk_put(sspi->clk);
 	pinctrl_put(sspi->p);
 	spi_master_put(master);