commit 36c7ee8831464a36ae027101b02f7f5a2ad19214
author Linux Build Service Account <lnxbuild@localhost> Mon May 05 15:13:26 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon May 05 15:13:26 2014 -0700
tree 9611625e8de3e2aa5147b0020b123460b02cbf4f
parent 5833f855fdc8b5a28ae425f075e2aca4e54259c7
parent cee7ba6eb1a3f45f93efea7c99cdd67222a3cd02

Merge "msm: mdss: disable irq to enforce mutex within dsi_event_thread"

drivers/video/msm/mdss/mdss_dsi_host.c

diff --git a/drivers/video/msm/mdss/mdss_dsi_host.c b/drivers/video/msm/mdss/mdss_dsi_host.c
index 3cd014c..41035b4 100644
--- a/drivers/video/msm/mdss/mdss_dsi_host.c
+++ b/drivers/video/msm/mdss/mdss_dsi_host.c
@@ -1381,11 +1381,11 @@
 		}
 
 		if (todo & DSI_EV_MDP_BUSY_RELEASE) {
-			spin_lock(&ctrl->mdp_lock);
+			spin_lock_irqsave(&ctrl->mdp_lock, flag);
 			ctrl->mdp_busy = false;
 			mdss_dsi_disable_irq_nosync(ctrl, DSI_MDP_TERM);
 			complete(&ctrl->mdp_comp);
-			spin_unlock(&ctrl->mdp_lock);
+			spin_unlock_irqrestore(&ctrl->mdp_lock, flag);
 
 			/* enable dsi error interrupt */
 			mdss_dsi_err_intr_ctrl(ctrl, DSI_INTR_ERROR_MASK, 1);