From 0d69931841dd7966919d78a5bc8b71f4a1731f37 Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Mon, 12 Nov 2012 16:52:11 +0200
Subject: [PATCH] --- yaml --- r: 344654 b: refs/heads/master c:
 1de8e129f5e77e5eac6dc0a30df403404ddcd2b3 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 2918dfa74aef..7771e6fc8175 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e12be71fbad99efba4324843890d3b557dfc05c
+refs/heads/master: 1de8e129f5e77e5eac6dc0a30df403404ddcd2b3
diff --git a/trunk/drivers/video/omap2/dss/dpi.c b/trunk/drivers/video/omap2/dss/dpi.c
index 1e103b3135b9..c109fa68c01d 100644
--- a/trunk/drivers/video/omap2/dss/dpi.c
+++ b/trunk/drivers/video/omap2/dss/dpi.c
@@ -412,7 +412,7 @@ static int __init dpi_init_display(struct omap_dss_device *dssdev)
 	 */
 	dsidev = dpi_get_dsidev(dssdev->channel);
 
-	if (dpi_verify_dsi_pll(dsidev)) {
+	if (dsidev && dpi_verify_dsi_pll(dsidev)) {
 		dsidev = NULL;
 		DSSWARN("DSI PLL not operational\n");
 	}