svn commit: r190132 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb dev/drm

[Robert Noland]

Author: rnoland
Date: Fri Mar 20 05:46:25 2009
New Revision: 190132
URL: http://svn.freebsd.org/changeset/base/190132

Log:
  Merge 189912
  
  Minor code cleanup

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/dev/drm/drm_bufs.c

Modified: stable/7/sys/dev/drm/drm_bufs.c
==============================================================================
--- stable/7/sys/dev/drm/drm_bufs.c	Fri Mar 20 05:45:26 2009	(r190131)
+++ stable/7/sys/dev/drm/drm_bufs.c	Fri Mar 20 05:46:25 2009	(r190132)
@@ -216,7 +216,7 @@ int drm_addmap(struct drm_device * dev, 
 			DRM_LOCK();
 			return EINVAL;
 		}
-		map->offset = map->offset + dev->sg->handle;
+		map->offset += dev->sg->handle;
 		break;
 	case _DRM_CONSISTENT:
 		/* Unfortunately, we don't get any alignment specification from