OMAP: DSS2: Avoid enabling panel if none is around

Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>

1 files changed, 10 insertions, 0 deletions

diff --git a/drivers/video/omap2/displays/panel-generic-dpi.c b/drivers/video/omap2/displays/panel-generic-dpi.c
index 54f1884ff5b..fdeeda158c8 100644
--- a/drivers/video/omap2/displays/panel-generic-dpi.c
+++ b/drivers/video/omap2/displays/panel-generic-dpi.c
@@ -192,6 +192,9 @@ struct panel_drv_data {
 	struct panel_config *panel_config;
 };
 
+static bool generic_dpi_panel_is_detected(struct omap_dss_device *dssdev,
+				bool force);
+
 static inline struct panel_generic_dpi_data
 *get_panel_data(const struct omap_dss_device *dssdev)
 {
@@ -302,6 +305,13 @@ static int generic_dpi_panel_enable(struct omap_dss_device *dssdev)
 {
 	int r = 0;
 
+	/* Avoid enabling the panel if there is none around */
+	if (!generic_dpi_panel_is_detected(dssdev, false)) {
+		printk(KERN_ERR "Not enabling generic panel as no "
+				"connector is detected\n");
+		return 1;
+	}
+
 	r = generic_dpi_panel_power_on(dssdev);
 	if (r)
 		return r;