From owner-svn-src-head@FreeBSD.ORG  Mon Jan 12 17:18:58 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 A69F1106564A;
	Mon, 12 Jan 2009 17:18:58 +0000 (UTC)
	(envelope-from obrien@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9596D8FC17;
	Mon, 12 Jan 2009 17:18:58 +0000 (UTC)
	(envelope-from obrien@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 n0CHIw4d071665;
	Mon, 12 Jan 2009 17:18:58 GMT (envelope-from obrien@svn.freebsd.org)
Received: (from obrien@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0CHIwJx071664;
	Mon, 12 Jan 2009 17:18:58 GMT (envelope-from obrien@svn.freebsd.org)
Message-Id: <200901121718.n0CHIwJx071664@svn.freebsd.org>
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Mon, 12 Jan 2009 17:18:58 +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: r187105 - 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: Mon, 12 Jan 2009 17:18:59 -0000

Author: obrien
Date: Mon Jan 12 17:18:58 2009
New Revision: 187105
URL: http://svn.freebsd.org/changeset/base/187105

Log:
  Fix issue where ata_atapicmd() can never really return EBUSY which is
  expected in acd_fixate().
  
  This should fix various problems folks are having with 'burncd' reporting
  "burncd: ioctl(CDRIOCFIXATE): Input/output error" during the fixate phase
  when "fixate" is issued together with the "data" command.
  
  PR:		95979
  Submitted by:	Jaakko Heinonen <jh@saunalahti.fi>

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

Modified: head/sys/dev/ata/ata-queue.c
==============================================================================
--- head/sys/dev/ata/ata-queue.c	Mon Jan 12 17:15:09 2009	(r187104)
+++ head/sys/dev/ata/ata-queue.c	Mon Jan 12 17:18:58 2009	(r187105)
@@ -434,7 +434,8 @@ ata_completed(void *context, int dummy)
 		printf("\n");
 	}
 
-	if ((request->u.atapi.sense.key & ATA_SENSE_KEY_MASK ?
+	if (!request->result &&
+	     (request->u.atapi.sense.key & ATA_SENSE_KEY_MASK ?
 	     request->u.atapi.sense.key & ATA_SENSE_KEY_MASK : 
 	     request->error))
 	    request->result = EIO;