---

yaml --- r: 313575 b: refs/heads/master c: cb53417 h: refs/heads/master i: 313573: aedd917 313571: 207dc5f 313567: 159f520 v: v3
git-mirror · Jun 12, 2012 · 0390b38 · 0390b38
1 parent bde341c
commit 0390b38
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f762470b522014ce4ebda3ecac74eb6658da7d9d
+refs/heads/master: cb53417efc726f3c243eaaeb9fce1d15bda05521
diff --git a/trunk/drivers/spi/spi-tegra.c b/trunk/drivers/spi/spi-tegra.c
@@ -261,7 +261,7 @@ static void spi_tegra_start_transfer(struct spi_device *spi,
 		clk_set_rate(tspi->clk, speed);
 
 	if (tspi->cur_speed == 0)
-		clk_enable(tspi->clk);
+		clk_prepare_enable(tspi->clk);
 
 	tspi->cur_speed = speed;
 
@@ -373,7 +373,7 @@ static void tegra_spi_rx_dma_complete(struct tegra_dma_req *req)
 			spi = m->state;
 			spi_tegra_start_message(spi, m);
 		} else {
-			clk_disable(tspi->clk);
+			clk_disable_unprepare(tspi->clk);
 			tspi->cur_speed = 0;
 		}
 	}