From 1115b21ead35f180bc63879c3855ad05f04737bc Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Mon, 19 Nov 2012 14:50:30 +0530
Subject: [PATCH] --- yaml --- r: 336127 b: refs/heads/master c:
 c69d5276704e1a9c771de57c0a2e7b69ea3ea578 h: refs/heads/master i:   336125:
 36ed8af3c82241431dd44ff85239820a6a603121   336123:
 f52a1e530746ebbf822a50240bb4d9e386ebb4ed   336119:
 60fe7e6248d5c9d33517ecc32cf3c98bb1c16167   336111:
 86fa2016dd511c5a856d5689c6b12828f3890fa8   336095:
 6e20c502fa8e77b70ae9afaff07b038383ba5a7e   336063:
 4f81279471aee66446b0c019176a97422967f92c   335999:
 7aaa5b18784af4adfba7a7bfce0df39b0dbda989   335871:
 3e43c2f1c537ec292c9eb6ef6ca10dd05db0394f v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/gpu/drm/exynos/exynos_drm_encoder.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3eaa237ac934..9939bcfdd873 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77b1c0362ffdb11128590a7248f3f8c434ab42f2
+refs/heads/master: c69d5276704e1a9c771de57c0a2e7b69ea3ea578
diff --git a/trunk/drivers/gpu/drm/exynos/exynos_drm_encoder.c b/trunk/drivers/gpu/drm/exynos/exynos_drm_encoder.c
index 607231a71b2d..f2df06c603f7 100644
--- a/trunk/drivers/gpu/drm/exynos/exynos_drm_encoder.c
+++ b/trunk/drivers/gpu/drm/exynos/exynos_drm_encoder.c
@@ -513,6 +513,6 @@ void exynos_drm_encoder_plane_disable(struct drm_encoder *encoder, void *data)
 	 * because the setting for disabling the overlay will be updated
 	 * at vsync.
 	 */
-	if (overlay_ops->wait_for_vblank)
+	if (overlay_ops && overlay_ops->wait_for_vblank)
 		overlay_ops->wait_for_vblank(manager->dev);
 }