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

This commit is contained in:
Linux Build Service Account
2012-04-23 11:20:16 -07:00
committed by QuIC Gerrit Code Review

View File

@@ -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;
}