diff --git a/arch/arm/mach-msm/clock-mdss-8974.c b/arch/arm/mach-msm/clock-mdss-8974.c
index 3d33993..85d535b 100644
--- a/arch/arm/mach-msm/clock-mdss-8974.c
+++ b/arch/arm/mach-msm/clock-mdss-8974.c
@@ -1701,11 +1701,9 @@
 
 	pr_debug("%s: rate=%ld\n", __func__, vco->rate);
 
-	if (!vco->rate_set)
+	if (!vco->rate_set && vco->rate)
 		ret = hdmi_vco_set_rate(c, vco->rate);
 
-	vco->rate_set = false;
-
 	if (!ret)
 		ret = clk_prepare(mdss_ahb_clk);
 
@@ -1714,6 +1712,10 @@
 
 static void hdmi_vco_unprepare(struct clk *c)
 {
+	struct hdmi_pll_vco_clk *vco = to_hdmi_vco_clk(c);
+
+	vco->rate_set = false;
+
 	clk_unprepare(mdss_ahb_clk);
 }