Date: Tue, 1 Mar 2011 18:05:58 +0000 (UTC) From: Jaakko Heinonen <jh@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r219142 - stable/7/sys/dev/ata Message-ID: <201103011805.p21I5w53046865@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jh Date: Tue Mar 1 18:05:57 2011 New Revision: 219142 URL: http://svn.freebsd.org/changeset/base/219142 Log: MFC r187105 by obrien: 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 Modified: stable/7/sys/dev/ata/ata-queue.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/ata/ata-queue.c ============================================================================== --- stable/7/sys/dev/ata/ata-queue.c Tue Mar 1 17:39:27 2011 (r219141) +++ stable/7/sys/dev/ata/ata-queue.c Tue Mar 1 18:05:57 2011 (r219142) @@ -443,7 +443,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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201103011805.p21I5w53046865>