From ca22a3f4716ae6eea5435f26b454ad7bfe469d7a Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Wed, 31 Aug 2011 14:47:11 +0300
Subject: [PATCH] --- yaml --- r: 271420 b: refs/heads/master c:
 3870c909f2fc880dece633772f2551aa70d26979 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/video/omap2/dss/hdmi.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 378596f51228..403cb4af3c94 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e82b090b80a41f2b5d9daec4c73edd76e2865419
+refs/heads/master: 3870c909f2fc880dece633772f2551aa70d26979
diff --git a/trunk/drivers/video/omap2/dss/hdmi.c b/trunk/drivers/video/omap2/dss/hdmi.c
index 4752137b226a..06a78b2ab690 100644
--- a/trunk/drivers/video/omap2/dss/hdmi.c
+++ b/trunk/drivers/video/omap2/dss/hdmi.c
@@ -529,10 +529,10 @@ static int hdmi_power_on(struct omap_dss_device *dssdev)
 	dispc_set_digit_size(dssdev->panel.timings.x_res,
 			dssdev->panel.timings.y_res);
 
-	dispc_mgr_enable(OMAP_DSS_CHANNEL_DIGIT, 1);
-
 	hdmi.ip_data.ops->video_enable(&hdmi.ip_data, 1);
 
+	dispc_mgr_enable(OMAP_DSS_CHANNEL_DIGIT, 1);
+
 	return 0;
 err:
 	hdmi_runtime_put();