From 6c12723a75e1e21ba0fe32c363256dc651b58c6e Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Date: Tue, 8 Dec 2009 17:30:24 +0200
Subject: [PATCH] --- yaml --- r: 179192 b: refs/heads/master c:
 7475e44246e8a7c435a7ed8fe1e94fc8898685d9 h: refs/heads/master v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/video/omap2/dss/dsi.c | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 5c62425baef6..51b37ea999cd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dfc0fd8d8850ef11951ba6c251e06096d1b5a0bd
+refs/heads/master: 7475e44246e8a7c435a7ed8fe1e94fc8898685d9
diff --git a/trunk/drivers/video/omap2/dss/dsi.c b/trunk/drivers/video/omap2/dss/dsi.c
index 03f85df70749..e32a53c0889f 100644
--- a/trunk/drivers/video/omap2/dss/dsi.c
+++ b/trunk/drivers/video/omap2/dss/dsi.c
@@ -2932,11 +2932,15 @@ static int dsi_set_update_mode(struct omap_dss_device *dssdev,
 
 static int dsi_set_te(struct omap_dss_device *dssdev, bool enable)
 {
-	int r;
-	r = dssdev->driver->enable_te(dssdev, enable);
-	/* XXX for some reason, DSI TE breaks if we don't wait here.
-	 * Panel bug? Needs more studying */
-	msleep(100);
+	int r = 0;
+
+	if (dssdev->driver->enable_te) {
+		r = dssdev->driver->enable_te(dssdev, enable);
+		/* XXX for some reason, DSI TE breaks if we don't wait here.
+		 * Panel bug? Needs more studying */
+		msleep(100);
+	}
+
 	return r;
 }