From owner-svn-src-all@FreeBSD.ORG  Tue Jun 23 18:24:09 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 D0DE9106568B;
	Tue, 23 Jun 2009 18:24:09 +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 BE7DA8FC18;
	Tue, 23 Jun 2009 18:24:09 +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 n5NIO9Dt085810;
	Tue, 23 Jun 2009 18:24:09 GMT (envelope-from rnoland@svn.freebsd.org)
Received: (from rnoland@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5NIO9IZ085808;
	Tue, 23 Jun 2009 18:24:09 GMT (envelope-from rnoland@svn.freebsd.org)
Message-Id: <200906231824.n5NIO9IZ085808@svn.freebsd.org>
From: Robert Noland <rnoland@FreeBSD.org>
Date: Tue, 23 Jun 2009 18:24:09 +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: r194749 - 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: Tue, 23 Jun 2009 18:24:10 -0000

Author: rnoland
Date: Tue Jun 23 18:24:09 2009
New Revision: 194749
URL: http://svn.freebsd.org/changeset/base/194749

Log:
  Only release irq resources if we were actually using them.
  
  MFC after:	3 days

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

Modified: head/sys/dev/drm/drm_drv.c
==============================================================================
--- head/sys/dev/drm/drm_drv.c	Tue Jun 23 18:09:35 2009	(r194748)
+++ head/sys/dev/drm/drm_drv.c	Tue Jun 23 18:24:09 2009	(r194749)
@@ -273,11 +273,14 @@ int drm_detach(device_t kdev)
 
 	drm_unload(dev);
 
-	bus_release_resource(dev->device, SYS_RES_IRQ, dev->irqrid, dev->irqr);
-
-	if (dev->msi_enabled) {
-		pci_release_msi(dev->device);
-		DRM_INFO("MSI released\n");
+	if (dev->irqr) {
+		bus_release_resource(dev->device, SYS_RES_IRQ, dev->irqrid,
+		    dev->irqr);
+
+		if (dev->msi_enabled) {
+			pci_release_msi(dev->device);
+			DRM_INFO("MSI released\n");
+		}
 	}
 
 	return 0;