From: Jeff Garzik Date: Sun, 9 Oct 2005 14:49:34 +0000 (-0400) Subject: [libata passthru] update ATAPI completion for new error handling X-Git-Tag: v2.6.15-rc1~732^2~8 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=422fa08e538b649a9b80258950d2f8a202f45f19;p=linux-2.6 [libata passthru] update ATAPI completion for new error handling --- diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c index 698203bf4f..617534b7a2 100644 --- a/drivers/scsi/libata-scsi.c +++ b/drivers/scsi/libata-scsi.c @@ -1933,7 +1933,12 @@ static int atapi_qc_complete(struct ata_queued_cmd *qc, u8 drv_stat) VPRINTK("ENTER, drv_stat == 0x%x\n", drv_stat); if (unlikely(drv_stat & (ATA_BUSY | ATA_DRQ))) - ata_to_sense_error(qc, drv_stat); + /* FIXME: not quite right; we don't want the + * translation of taskfile registers into + * a sense descriptors, since that's only + * correct for ATA, not ATAPI + */ + ata_gen_ata_desc_sense(qc); else if (unlikely(drv_stat & ATA_ERR)) { DPRINTK("request check condition\n");