From 0390b38d086250788f537e008e7fd004b6e0a186 Mon Sep 17 00:00:00 2001 From: Prashant Gaikwad Date: Tue, 5 Jun 2012 09:59:40 +0530 Subject: [PATCH] --- yaml --- r: 313575 b: refs/heads/master c: cb53417efc726f3c243eaaeb9fce1d15bda05521 h: refs/heads/master i: 313573: aedd9179fa6c9b6cec582bc516eebcb729aad054 313571: 207dc5f4a25ff3b67e8316122da74293fd71a5a8 313567: 159f520f1509a36fb387a1126771f933b4e6f054 v: v3 --- [refs] | 2 +- trunk/drivers/spi/spi-tegra.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1bee780b1821..5f6fd0d48731 100644 --- 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 index ae6d78a3e912..7f99ff3553a6 100644 --- 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; } }