Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux...

[karo-tx-linux.git] / drivers / spi / spi-tegra.c

diff --git a/drivers/spi/spi-tegra.c b/drivers/spi/spi-tegra.c
index 956ff4a0827bd25a5b91b62b95dbba4c8224bae3..ef52c1c6f5c5e6c78759149986ff0bf2af6b6c06 100644 (file)
--- a/drivers/spi/spi-tegra.c
+++ b/drivers/spi/spi-tegra.c
@@ -287,7 +287,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;
 
@@ -398,7 +398,7 @@ static void handle_spi_rx_dma_complete(struct spi_tegra_data *tspi)
                        spi = m->state;
                        spi_tegra_start_message(spi, m);
                } else {
-                       clk_disable(tspi->clk);
+                       clk_disable_unprepare(tspi->clk);
                        tspi->cur_speed = 0;
                }
        }