svn commit: r187105 - head/sys/dev/ata

[David E. O'Brien]

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 at 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;