svn commit: r200474 - stable/8/sys/dev/drm

[Robert Noland]

Author: rnoland
Date: Sun Dec 13 14:55:50 2009
New Revision: 200474
URL: http://svn.freebsd.org/changeset/base/200474

Log:
  MFC 198332
  
  Check pointer for NULL before dereferencing it, not after.
  
  Originally committed by:	brueffer

Modified:
  stable/8/sys/dev/drm/mach64_state.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/dev/drm/mach64_state.c
==============================================================================
--- stable/8/sys/dev/drm/mach64_state.c	Sun Dec 13 13:57:32 2009	(r200473)
+++ stable/8/sys/dev/drm/mach64_state.c	Sun Dec 13 14:55:50 2009	(r200474)
@@ -826,7 +826,7 @@ int mach64_dma_vertex(struct drm_device 
 		      struct drm_file *file_priv)
 {
 	drm_mach64_private_t *dev_priv = dev->dev_private;
-	drm_mach64_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_mach64_sarea_t *sarea_priv;
 	drm_mach64_vertex_t *vertex = data;
 
 	LOCK_TEST_WITH_RETURN(dev, file_priv);
@@ -835,6 +835,7 @@ int mach64_dma_vertex(struct drm_device 
 		DRM_ERROR("called with no initialization\n");
 		return -EINVAL;
 	}
+	sarea_priv = dev_priv->sarea_priv;
 
 	DRM_DEBUG("pid=%d buf=%p used=%lu discard=%d\n",
 		  DRM_CURRENTPID,