From f48b7520c0b45eaa53d00860fa5b42e82d50da95 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 7 Feb 2012 09:44:55 +0000
Subject: [PATCH] --- yaml --- r: 287573 b: refs/heads/master c:
 40410715715178ec196314dd0c19150c06901f80 h: refs/heads/master i:   287571:
 e33832b2d456a32f02b1eff2f75158a5a6616db5 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/video/omap2/dss/dpi.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 51f5b3fd2097..afb4b8e4edf0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d980e0f8d858c6963d676013e976ff00ab7acb2b
+refs/heads/master: 40410715715178ec196314dd0c19150c06901f80
diff --git a/trunk/drivers/video/omap2/dss/dpi.c b/trunk/drivers/video/omap2/dss/dpi.c
index 395d658a94fc..faaf305fda27 100644
--- a/trunk/drivers/video/omap2/dss/dpi.c
+++ b/trunk/drivers/video/omap2/dss/dpi.c
@@ -180,6 +180,11 @@ int omapdss_dpi_display_enable(struct omap_dss_device *dssdev)
 {
 	int r;
 
+	if (cpu_is_omap34xx() && !dpi.vdds_dsi_reg) {
+		DSSERR("no VDSS_DSI regulator\n");
+		return -ENODEV;
+	}
+
 	if (dssdev->manager == NULL) {
 		DSSERR("failed to enable display: no manager\n");
 		return -ENODEV;