From owner-svn-src-all@FreeBSD.ORG  Mon Oct 27 09:26:24 2008
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 967A0106567E;
	Mon, 27 Oct 2008 09:26:24 +0000 (UTC) (envelope-from sos@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8625D8FC12;
	Mon, 27 Oct 2008 09:26:24 +0000 (UTC) (envelope-from sos@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 m9R9QONJ033764;
	Mon, 27 Oct 2008 09:26:24 GMT (envelope-from sos@svn.freebsd.org)
Received: (from sos@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9R9QOZQ033763;
	Mon, 27 Oct 2008 09:26:24 GMT (envelope-from sos@svn.freebsd.org)
Message-Id: <200810270926.m9R9QOZQ033763@svn.freebsd.org>
From: Søren Schmidt <sos@FreeBSD.org>
Date: Mon, 27 Oct 2008 09:26: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: r184328 - head/sys/dev/ata
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: Mon, 27 Oct 2008 09:26:24 -0000

Author: sos
Date: Mon Oct 27 09:26:24 2008
New Revision: 184328
URL: http://svn.freebsd.org/changeset/base/184328

Log:
  Only call dma.unload() if initialized.
  
  Reported by: Stanislav Sedov

Modified:
  head/sys/dev/ata/ata-queue.c

Modified: head/sys/dev/ata/ata-queue.c
==============================================================================
--- head/sys/dev/ata/ata-queue.c	Mon Oct 27 08:40:13 2008	(r184327)
+++ head/sys/dev/ata/ata-queue.c	Mon Oct 27 09:26:24 2008	(r184328)
@@ -503,7 +503,8 @@ ata_timeout(struct ata_request *request)
 	request->flags |= ATA_R_TIMEOUT;
 	mtx_unlock(&ch->state_mtx);
 	ATA_LOCKING(ch->dev, ATA_LF_UNLOCK);
-	ch->dma.unload(request);
+	if (ch->dma.unload)
+	    ch->dma.unload(request);
 	ata_finish(request);
     }
     else {