[libata passthru] update ATAPI completion for new error handling

diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index 698203bf4f69279b433cca223406e407f0139ed6..617534b7a25ebee44d4d1a4e00478fd6b97bc4bb 100644 (file)
--- 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");