---

yaml --- r: 336127 b: refs/heads/master c: c69d527 h: refs/heads/master i: 336125: 36ed8af 336123: f52a1e5 336119: 60fe7e6 336111: 86fa201 336095: 6e20c50 336063: 4f81279 335999: 7aaa5b1 335871: 3e43c2f v: v3
git-mirror · Nov 22, 2012 · 1115b21 · 1115b21
1 parent 1e98098
commit 1115b21
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: 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
@@ -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);
 }