From owner-svn-src-all@FreeBSD.ORG  Sat Jun 20 16:37:25 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 015E3106564A;
	Sat, 20 Jun 2009 16:37:25 +0000 (UTC)
	(envelope-from rnoland@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E3BC78FC16;
	Sat, 20 Jun 2009 16:37:24 +0000 (UTC)
	(envelope-from rnoland@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5KGbOWH080980;
	Sat, 20 Jun 2009 16:37:24 GMT (envelope-from rnoland@svn.freebsd.org)
Received: (from rnoland@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5KGbOh2080978;
	Sat, 20 Jun 2009 16:37:24 GMT (envelope-from rnoland@svn.freebsd.org)
Message-Id: <200906201637.n5KGbOh2080978@svn.freebsd.org>
From: Robert Noland <rnoland@FreeBSD.org>
Date: Sat, 20 Jun 2009 16:37:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194537 - head/sys/dev/drm
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 20 Jun 2009 16:37:25 -0000

Author: rnoland
Date: Sat Jun 20 16:37:24 2009
New Revision: 194537
URL: http://svn.freebsd.org/changeset/base/194537

Log:
  Don't panic if drm_rmmap is called with a NULL map pointer.
  
  MFC after:	3 days

Modified:
  head/sys/dev/drm/drm_bufs.c

Modified: head/sys/dev/drm/drm_bufs.c
==============================================================================
--- head/sys/dev/drm/drm_bufs.c	Sat Jun 20 16:30:32 2009	(r194536)
+++ head/sys/dev/drm/drm_bufs.c	Sat Jun 20 16:37:24 2009	(r194537)
@@ -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) {