[PATCH] libata: return AC_ERR_* from issue functions

Return AC_ERR_* mask from issue fuctions instead of 0/-1.  This
enables things like failing a qc with AC_ERR_HSM when the device
doesn't set DRDY when the qc is about to be issued.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index c496309f691a..95e3c278dd43 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -1322,10 +1322,9 @@ static void ata_scsi_translate(struct ata_port *ap, struct ata_device *dev,
                 goto early_finish;
 
         /* select device, send command to hardware */
-        if (ata_qc_issue(qc)) {
-                qc->err_mask |= AC_ERR_OTHER;
+        qc->err_mask = ata_qc_issue(qc);
+        if (qc->err_mask)
                 ata_qc_complete(qc);
-        }
 
         VPRINTK("EXIT\n");
         return;
@@ -2044,10 +2043,9 @@ static void atapi_request_sense(struct ata_queued_cmd *qc)
 
         qc->complete_fn = atapi_sense_complete;
 
-        if (ata_qc_issue(qc)) {
-                qc->err_mask |= AC_ERR_OTHER;
+        qc->err_mask = ata_qc_issue(qc);
+        if (qc->err_mask)
                 ata_qc_complete(qc);
-        }
 
         DPRINTK("EXIT\n");
 }