---

yaml
---
r: 271359
b: refs/heads/master
c: 79e4424
h: refs/heads/master
i:
  271357: 2b0bc97
  271355: 12c09b0
  271351: 7bc013d
  271343: 4dde5a8
  271327: 31e0726
  271295: ce27f1e
  271231: fd88368
  271103: c09c955
  270847: abf67a1
  270335: 472def9
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24305db864cd62bf4279f745528c3238cbaf1c12
+refs/heads/master: 79e4424fbe83a4f2170f3cfa4628d5a34c520d37

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);