From 475eba0b182f10222f01afb4e9d734671aca675a Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Thu, 23 Jun 2011 16:36:36 +0300
Subject: [PATCH] --- yaml --- r: 271359 b: refs/heads/master c:
 79e4424fbe83a4f2170f3cfa4628d5a34c520d37 h: refs/heads/master i:   271357:
 2b0bc97b89277f636c24a47eebc839d64929813b   271355:
 12c09b067406e56b7f337d5f1fdb72340133b424   271351:
 7bc013dad8fb3f8968e718c0145fd77c005549d6   271343:
 4dde5a8acfbc735cb76935b563f7324c6dc0fab0   271327:
 31e072620498e7e42226e2c840e14ebb8cfb06ea   271295:
 ce27f1eff41d60a184b7d3c0795e17b0a3150d64   271231:
 fd8836874adf330ea601a2827ce0170e3636cf08   271103:
 c09c955e894276f830c6b8116c5c296d1b5e3b4c   270847:
 abf67a1a5ca8f9127733c189650ee8e7ab4b5232   270335:
 472def92e9592e05ff1119c884c22b591f8415ba v: v3

---
 [refs]                                             | 2 +-
 trunk/drivers/video/omap2/displays/panel-picodlp.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 421ad90a19a9..c4370180da48 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24305db864cd62bf4279f745528c3238cbaf1c12
+refs/heads/master: 79e4424fbe83a4f2170f3cfa4628d5a34c520d37
diff --git a/trunk/drivers/video/omap2/displays/panel-picodlp.c b/trunk/drivers/video/omap2/displays/panel-picodlp.c
index b663e60e1a11..f0a51f49e48c 100644
--- a/trunk/drivers/video/omap2/displays/panel-picodlp.c
+++ b/trunk/drivers/video/omap2/displays/panel-picodlp.c
@@ -370,16 +370,18 @@ static int picodlp_panel_power_on(struct omap_dss_device *dssdev)
 	 * then only i2c commands can be successfully sent to dpp2600
 	 */
 	msleep(1000);
-	if (omapdss_dpi_display_enable(dssdev)) {
+	r = omapdss_dpi_display_enable(dssdev);
+	if (r) {
 		dev_err(&dssdev->dev, "failed to enable DPI\n");
 		goto err1;
 	}
-	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
 
 	r = picodlp_i2c_init(picod->picodlp_i2c_client);
 	if (r)
 		goto err;
 
+	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+
 	return r;
 err:
 	omapdss_dpi_display_disable(dssdev);