commit daf63ffa7a4da50ffaed78327eda2193ae31a4cb
author Linux Build Service Account <lnxbuild@localhost> Mon Apr 23 11:20:16 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Mon Apr 23 11:20:16 2012 -0700
tree bfc2534d7fa81fb0d4fc45cd9504cb7b1617ffa0
parent c7dd678705970677b466d3dad8b82a36f26558be
parent d56429b1a1623418f6659b1e05c323d175437af8

Merge "msm: camera: Fix for enabling vfe_clk" into msm-3.0

drivers/media/video/msm/msm_axi_qos.c

diff --git a/drivers/media/video/msm/msm_axi_qos.c b/drivers/media/video/msm/msm_axi_qos.c
index 3969547..eaceceb 100644
--- a/drivers/media/video/msm/msm_axi_qos.c
+++ b/drivers/media/video/msm/msm_axi_qos.c
@@ -22,8 +22,10 @@
 	ebi1_clk = clk_get(NULL, "ebi1_vfe_clk");
 	if (IS_ERR(ebi1_clk))
 		ebi1_clk = NULL;
-	else
+	else {
+		clk_prepare(ebi1_clk);
 		clk_enable(ebi1_clk);
+	}
 
 	return 0;
 }
@@ -42,6 +44,7 @@
 		return;
 
 	clk_disable(ebi1_clk);
+	clk_unprepare(ebi1_clk);
 	clk_put(ebi1_clk);
 	ebi1_clk = NULL;
 }