diff --git a/drivers/media/video/msm/msm_axi_qos.c b/drivers/media/video/msm/msm_axi_qos.c
index 3969547cd17..eaceceb1234 100644
--- a/drivers/media/video/msm/msm_axi_qos.c
+++ b/drivers/media/video/msm/msm_axi_qos.c
@@ -22,8 +22,10 @@ int add_axi_qos(void)
 	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 @@ void release_axi_qos(void)
 		return;
 
 	clk_disable(ebi1_clk);
+	clk_unprepare(ebi1_clk);
 	clk_put(ebi1_clk);
 	ebi1_clk = NULL;
 }