Author: rnoland
Date: Tue Jun 23 16:11:44 2009
New Revision: 194735
URL: http://svn.freebsd.org/changeset/base/194735
Log:
Merge 194537 from HEAD
Don't panic if drm_rmmap is called with a NULL map pointer.
Modified:
stable/7/sys/ (props changed)
stable/7/sys/contrib/pf/ (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 Tue Jun 23 16:09:05 2009
(r194734)
+++ stable/7/sys/dev/drm/drm_bufs.c Tue Jun 23 16:11:44 2009
(r194735)
@@ -296,6 +296,9 @@ void drm_rmmap(struct drm_device *dev, d
{
DRM_SPINLOCK_ASSERT(&dev->dev_lock);
+ if (map == NULL)
+ return;
+
TAILQ_REMOVE(&dev->maplist, map, link);
switch (map->type) {
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
