summaryrefslogtreecommitdiff
path: root/drivers/scsi/libata-scsi.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-09 18:49:34 +0400
committerJeff Garzik <jgarzik@pobox.com>2005-10-09 18:49:34 +0400
commit422fa08e538b649a9b80258950d2f8a202f45f19 (patch)
tree85fd3f5f5e47783622157c0aa84d7c19b7a47eeb /drivers/scsi/libata-scsi.c
parentffe75ef650e1aec26a84bd82a620b5e27df9ed34 (diff)
downloadlinux-422fa08e538b649a9b80258950d2f8a202f45f19.tar.xz
[libata passthru] update ATAPI completion for new error handling
Diffstat (limited to 'drivers/scsi/libata-scsi.c')
-rw-r--r--drivers/scsi/libata-scsi.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index 698203bf4f69..617534b7a25e 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");