commit 8b56f986b3488ba32ca40d3a49a090d9e111bd1d
author Linux Build Service Account <lnxbuild@localhost> Fri Aug 31 22:47:26 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Fri Aug 31 22:47:26 2012 -0700
tree 48eca7898cbf4570bbd2a212c634fc8bbae44f6f
parent f8758a6ea68648dc80eb5442b92c92eaccc6a631
parent d7784e051a508a667a13d431b7d834725cef0379

Merge "msm_fb: display: Removing clk_set_rate in atomic context" into msm-3.4

drivers/video/msm/mipi_dsi.c

diff --git a/drivers/video/msm/mipi_dsi.c b/drivers/video/msm/mipi_dsi.c
index f08a4e4..e6e8aca 100644
--- a/drivers/video/msm/mipi_dsi.c
+++ b/drivers/video/msm/mipi_dsi.c
@@ -101,7 +101,6 @@
 	mdp_bus_scale_update_request(0);
 #endif
 
-	spin_lock_bh(&dsi_clk_lock);
 	mipi_dsi_clk_disable();
 
 	/* disbale dsi engine */
@@ -110,7 +109,6 @@
 	mipi_dsi_phy_ctrl(0);
 
 	mipi_dsi_ahb_ctrl(0);
-	spin_unlock_bh(&dsi_clk_lock);
 
 	mipi_dsi_unprepare_clocks();
 	if (mipi_dsi_pdata && mipi_dsi_pdata->dsi_power_save)