Fix disable first_boot logic in maphhone_panel

cujo · Feb 17, 2014 · 6f5e77b · 6f5e77b
1 parent cf85d06
commit 6f5e77b
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/drivers/video/omap2/displays/panel-mapphone.c b/drivers/video/omap2/displays/panel-mapphone.c
@@ -3782,12 +3782,7 @@ static void set_default_panel_init_state(struct omap_dss_device *dssdev)
 }
 static int mapphone_panel_power_on(struct omap_dss_device *dssdev)
 {
-#ifdef CONFIG_PANEL_MAPPHONE_SKIP_FIRSTBOOT
-	static bool first_boot = false;
-#else
 	static bool first_boot = true;
-#endif
-
 	struct mapphone_data *mp_data = dev_get_drvdata(&dssdev->dev);
 	int ret;
 	u8 power_mode = 0;
@@ -3816,6 +3811,20 @@ static int mapphone_panel_power_on(struct omap_dss_device *dssdev)
 		goto err0;
 	}
 
+#ifdef CONFIG_PANEL_MAPPHONE_SKIP_FIRSTBOOT
+	static bool skip_first_boot = true;
+#else
+	static bool skip_first_boot = false;
+#endif
+
+	if ((skip_first_boot || !first_boot) && !dssdev->phy.dsi.d2l_use_ulps) {
+		if (dssdev->platform_enable) {
+			ret = dssdev->platform_enable(dssdev);
+			if (ret)
+				goto err0;
+		}
+	}
+
 #ifdef CONFIG_FB_OMAP_BOOTLOADER_INIT
 	if (first_boot) {
 		/*
@@ -3846,14 +3855,6 @@ static int mapphone_panel_power_on(struct omap_dss_device *dssdev)
 	}
 #endif
 
-	if (!first_boot && !dssdev->phy.dsi.d2l_use_ulps) {
-		if (dssdev->platform_enable) {
-			ret = dssdev->platform_enable(dssdev);
-			if (ret)
-				goto err0;
-		}
-	}
-
 	mapphone_hw_reset(dssdev);
 
 	msleep(100);