Mesa (mesa_7_7_branch): vmware/xorg: Handle no init of video in vmw_video_close

Jakob Bornecrantz wallbraker at kemper.freedesktop.org
Mon Dec 7 09:22:22 PST 2009


Module: Mesa
Branch: mesa_7_7_branch
Commit: 12fdef20b02595c10cec91aad75abe6ca59f5513
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=12fdef20b02595c10cec91aad75abe6ca59f5513

Author: Jakob Bornecrantz <jakob at vmware.com>
Date:   Fri Dec  4 09:40:52 2009 +0100

vmware/xorg: Handle no init of video in vmw_video_close

---

 src/gallium/winsys/drm/vmware/xorg/vmw_video.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/gallium/winsys/drm/vmware/xorg/vmw_video.c b/src/gallium/winsys/drm/vmware/xorg/vmw_video.c
index 6e34aa2..d62c3b7 100644
--- a/src/gallium/winsys/drm/vmware/xorg/vmw_video.c
+++ b/src/gallium/winsys/drm/vmware/xorg/vmw_video.c
@@ -342,6 +342,8 @@ vmw_video_close(ScrnInfoPtr pScrn, struct vmw_driver *vmw)
     debug_printf("%s: enter\n", __func__);
 
     video = vmw->video_priv;
+    if (!video)
+	return TRUE;
 
     for (i = 0; i < VMWARE_VID_NUM_PORTS; ++i) {
         vmw_video_port_cleanup(pScrn, &video->port[i]);



More information about the mesa-commit mailing list