From owner-svn-src-head@FreeBSD.ORG  Wed Feb 18 21:12:48 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8A164106566B;
	Wed, 18 Feb 2009 21:12:48 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 789DB8FC19;
	Wed, 18 Feb 2009 21:12:48 +0000 (UTC) (envelope-from mav@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 n1ILCmg8074868;
	Wed, 18 Feb 2009 21:12:48 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1ILCm4Q074866;
	Wed, 18 Feb 2009 21:12:48 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <200902182112.n1ILCm4Q074866@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Wed, 18 Feb 2009 21:12:48 +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: r188763 - head/sys/dev/ata
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Feb 2009 21:12:49 -0000

Author: mav
Date: Wed Feb 18 21:12:48 2009
New Revision: 188763
URL: http://svn.freebsd.org/changeset/base/188763

Log:
  Make ch->dma.free() called symmetrically to ch->dma.alloc().

Modified:
  head/sys/dev/ata/ata-all.c
  head/sys/dev/ata/ata-pci.c

Modified: head/sys/dev/ata/ata-all.c
==============================================================================
--- head/sys/dev/ata/ata-all.c	Wed Feb 18 20:42:42 2009	(r188762)
+++ head/sys/dev/ata/ata-all.c	Wed Feb 18 21:12:48 2009	(r188763)
@@ -186,6 +186,11 @@ ata_detach(device_t dev)
     bus_teardown_intr(dev, ch->r_irq, ch->ih);
     bus_release_resource(dev, SYS_RES_IRQ, ATA_IRQ_RID, ch->r_irq);
     ch->r_irq = NULL;
+
+    /* free DMA resources if DMA HW present*/
+    if (ch->dma.free)
+	ch->dma.free(dev);
+
     mtx_destroy(&ch->state_mtx);
     mtx_destroy(&ch->queue_mtx);
     return 0;

Modified: head/sys/dev/ata/ata-pci.c
==============================================================================
--- head/sys/dev/ata/ata-pci.c	Wed Feb 18 20:42:42 2009	(r188762)
+++ head/sys/dev/ata/ata-pci.c	Wed Feb 18 21:12:48 2009	(r188763)
@@ -544,14 +544,11 @@ ata_pcichannel_attach(device_t dev)
 static int
 ata_pcichannel_detach(device_t dev)
 {
-    struct ata_channel *ch = device_get_softc(dev);
     int error;
 
     if ((error = ata_detach(dev)))
 	return error;
 
-    ch->dma.free(dev);
-
     /* XXX SOS free resources for io and ctlio ?? */
 
     return 0;