commit c4e627ecc08332366c0942a6885efcacc269f715
author Linux Build Service Account <lnxbuild@localhost> Fri Jul 18 00:09:43 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Jul 18 00:09:43 2014 -0700
tree cd712ae428615f5b4bd37671521c9523c57ca58c
parent c975a3b7f740db2f88659476aab97123bbe98851
parent 19ceff372e1c63b80fda3259388d64b01b4d96b3

Merge "msm: mdss: correct display reset gpio config during suspend"

drivers/video/msm/mdss/dsi_v2.c

diff --git a/drivers/video/msm/mdss/dsi_v2.c b/drivers/video/msm/mdss/dsi_v2.c
index 653b187..4fc3909 100644
--- a/drivers/video/msm/mdss/dsi_v2.c
+++ b/drivers/video/msm/mdss/dsi_v2.c
@@ -133,8 +133,8 @@
 		pdata->panel_info.panel_power_on = 0;
 		if (!pdata->panel_info.dynamic_switch_pending) {
 			if (pdata->panel_info.type == MIPI_CMD_PANEL)
-				mdss_dsi_panel_reset(pdata, 0);
-			dsi_ctrl_gpio_free(ctrl_pdata);
+				dsi_ctrl_gpio_free(ctrl_pdata);
+			mdss_dsi_panel_reset(pdata, 0);
 		}
 	}
 	return rc;