From owner-p4-projects@FreeBSD.ORG  Sun Sep 21 22:51:48 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6C8D9106570A; Sun, 21 Sep 2008 22:51:47 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 919CA1065671
	for <perforce@freebsd.org>; Sun, 21 Sep 2008 22:51:47 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7E6BA8FC25
	for <perforce@freebsd.org>; Sun, 21 Sep 2008 22:51:47 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8LMplbA062846
	for <perforce@freebsd.org>; Sun, 21 Sep 2008 22:51:47 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8LMplQs062841
	for perforce@freebsd.org; Sun, 21 Sep 2008 22:51:47 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Sun, 21 Sep 2008 22:51:47 GMT
Message-Id: <200809212251.m8LMplQs062841@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 150242 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 21 Sep 2008 22:51:48 -0000

http://perforce.freebsd.org/chv.cgi?CH=150242

Change 150242 by peter@peter_overcee on 2008/09/21 22:51:38

	It would be helpful if ata didn't panic when doing a printf() about a read error.

Affected files ...

.. //depot/projects/hammer/sys/dev/ata/ata-queue.c#39 edit

Differences ...

==== //depot/projects/hammer/sys/dev/ata/ata-queue.c#39 (text+ko) ====

@@ -357,9 +357,11 @@
 			      "\6MEDIA_CHANGED\5NID_NOT_FOUND"
 			      "\4MEDIA_CHANGE_REQEST"
 			      "\3ABORTED\2NO_MEDIA\1ILLEGAL_LENGTH");
+	if (request->dma) {
 		if ((request->flags & ATA_R_DMA) &&
 		    (request->dma->status & ATA_BMSTAT_ERROR))
 		    printf(" dma=0x%02x", request->dma->status);
+	}
 		if (!(request->flags & (ATA_R_ATAPI | ATA_R_CONTROL)))
 		    printf(" LBA=%ju", request->u.ata.lba);
 		printf("\n");