---

yaml --- r: 345516 b: refs/heads/master c: fdd66e0 h: refs/heads/master v: v3
git-mirror · Nov 29, 2012 · 81b29b6 · 81b29b6
1 parent 394d42f
commit 81b29b6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ecf18f9e769f77e918f2a18b35faf2a4844ad1a
+refs/heads/master: fdd66e06ce71cdcdb515ef355d4f2fc90e151503
diff --git 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);
 }