diff --git a/[refs] b/[refs]
index b4cc3d0a0fc6..250ae451bb25 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 597c854974db20eebe87e91df0d12daaefabf525
+refs/heads/master: 56482ec0b156811eb463576a89a47f89e21f3587
diff --git a/trunk/drivers/dma/tegra20-apb-dma.c b/trunk/drivers/dma/tegra20-apb-dma.c
index 6d7d5d383cb1..78af256cca9e 100644
--- a/trunk/drivers/dma/tegra20-apb-dma.c
+++ b/trunk/drivers/dma/tegra20-apb-dma.c
@@ -1366,7 +1366,7 @@ static int tegra_dma_runtime_suspend(struct device *dev)
 	struct platform_device *pdev = to_platform_device(dev);
 	struct tegra_dma *tdma = platform_get_drvdata(pdev);
 
-	clk_disable(tdma->dma_clk);
+	clk_disable_unprepare(tdma->dma_clk);
 	return 0;
 }
 
@@ -1376,7 +1376,7 @@ static int tegra_dma_runtime_resume(struct device *dev)
 	struct tegra_dma *tdma = platform_get_drvdata(pdev);
 	int ret;
 
-	ret = clk_enable(tdma->dma_clk);
+	ret = clk_prepare_enable(tdma->dma_clk);
 	if (ret < 0) {
 		dev_err(dev, "clk_enable failed: %d\n", ret);
 		return ret;